Skip to content

Commit ae0b070

Browse files
diemoldiemol
authored
Merge branch 'trunk' into 13779-bug-seleniums-gettext-atom-returns-wrong-capitalized-text-when-underscores-are-used-since-pr-8736
2 parents 6e123c9 + d142ce0 commit ae0b070

18 files changed

+95
-97
lines changed

‎javascript/node/selenium-webdriver/bidi/scriptManager.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,10 @@ class ScriptManager {
237237
const params = {
238238
functionDeclaration: functionDeclaration,
239239
arguments: argumentValueList,
240-
sandbox: sandbox,
240+
}
241+
242+
if (sandbox !== null) {
243+
params.sandbox = sandbox
241244
}
242245

243246
if (Array.isArray(this._browsingContextIds) && this._browsingContextIds.length > 0) {

‎javascript/node/selenium-webdriver/test/bidi/add_intercept_parameters_test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
'use strict'
1919

2020
const assert = require('assert')
21-
const firefox = require('../../firefox')
2221
const { Browser } = require('../../')
2322
const { suite } = require('../../lib/test')
2423
const Network = require('../../bidi/network')
@@ -31,7 +30,7 @@ suite(
3130
let driver
3231

3332
beforeEach(async function () {
34-
driver = await env.builder().setFirefoxOptions(new firefox.Options().enableBidi()).build()
33+
driver = await env.builder().build()
3534
})
3635

3736
afterEach(async function () {
@@ -106,5 +105,5 @@ suite(
106105
})
107106
})
108107
},
109-
{ browsers: [Browser.FIREFOX] },
108+
{ browsers: [Browser.FIREFOX, Browser.CHROME, Browser.EDGE] },
110109
)

‎javascript/node/selenium-webdriver/test/bidi/bidi_session_test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
'use strict'
1919

2020
const assert = require('assert')
21-
const firefox = require('../../firefox')
2221
const { Browser } = require('../../')
2322
const { suite } = require('../../lib/test')
2423

@@ -27,7 +26,7 @@ suite(
2726
let driver
2827

2928
beforeEach(async function () {
30-
driver = await env.builder().setFirefoxOptions(new firefox.Options().enableBidi()).build()
29+
driver = await env.builder().build()
3130
})
3231

3332
afterEach(async function () {
@@ -44,5 +43,5 @@ suite(
4443
})
4544
})
4645
},
47-
{ browsers: [Browser.FIREFOX] },
46+
{ browsers: [Browser.FIREFOX, Browser.CHROME, Browser.EDGE] },
4847
)

‎javascript/node/selenium-webdriver/test/bidi/bidi_test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
'use strict'
1919

2020
const assert = require('assert')
21-
const firefox = require('../../firefox')
2221
const { Browser } = require('../../')
2322
const { Pages, suite } = require('../../lib/test')
2423
const logInspector = require('../../bidi/logInspector')
@@ -30,7 +29,7 @@ suite(
3029
let driver
3130

3231
beforeEach(async function () {
33-
driver = await env.builder().setFirefoxOptions(new firefox.Options().enableBidi()).build()
32+
driver = await env.builder().build()
3433
})
3534

3635
afterEach(async function () {

‎javascript/node/selenium-webdriver/test/bidi/browser_test.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
'use strict'
1919

2020
const assert = require('assert')
21-
const firefox = require('../../firefox')
2221
const { suite } = require('../../lib/test')
2322
const { Browser } = require('../..')
2423
const BrowserBiDi = require('../../bidi/browser')
@@ -29,14 +28,14 @@ suite(
2928
let driver
3029

3130
beforeEach(async function () {
32-
driver = await env.builder().setFirefoxOptions(new firefox.Options().enableBidi()).build()
31+
driver = await env.builder().build()
3332
})
3433

3534
afterEach(function () {
3635
return driver.quit()
3736
})
3837

39-
xit('can create a user context', async function () {
38+
it('can create a user context', async function () {
4039
const browser = await BrowserBiDi(driver)
4140

4241
const userContext = await browser.createUserContext()
@@ -46,7 +45,7 @@ suite(
4645
await browser.removeUserContext(userContext)
4746
})
4847

49-
xit('can get user contexts', async function () {
48+
it('can get user contexts', async function () {
5049
const browser = await BrowserBiDi(driver)
5150

5251
const userContext1 = await browser.createUserContext()
@@ -60,7 +59,7 @@ suite(
6059
await browser.removeUserContext(userContext2)
6160
})
6261

63-
xit('can remove user context', async function () {
62+
it('can remove user context', async function () {
6463
const browser = await BrowserBiDi(driver)
6564

6665
const userContext1 = await browser.createUserContext()
@@ -81,5 +80,5 @@ suite(
8180
})
8281
})
8382
},
84-
{ browsers: [Browser.FIREFOX] },
83+
{ browsers: [Browser.FIREFOX, Browser.CHROME, Browser.EDGE] },
8584
)

‎javascript/node/selenium-webdriver/test/bidi/browsingcontext_inspector_test.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
'use strict'
1919

2020
const assert = require('assert')
21-
const firefox = require('../../firefox')
2221
const { Browser, By } = require('../../')
23-
const { Pages, suite } = require('../../lib/test')
22+
const { Pages, suite, ignore } = require('../../lib/test')
2423
const BrowsingContext = require('../../bidi/browsingContext')
2524
const BrowsingContextInspector = require('../../bidi/browsingContextInspector')
2625
const until = require('../../lib/until')
@@ -30,7 +29,7 @@ suite(
3029
let driver
3130

3231
beforeEach(async function () {
33-
driver = await env.builder().setFirefoxOptions(new firefox.Options().enableBidi()).build()
32+
driver = await env.builder().build()
3433
})
3534

3635
afterEach(async function () {
@@ -119,23 +118,26 @@ suite(
119118
assert(navigationInfo.url.includes('/bidi/logEntryAdded.html'))
120119
})
121120

122-
xit('can listen to navigation started event', async function () {
123-
let navigationInfo = null
124-
const browsingConextInspector = await BrowsingContextInspector(driver)
121+
ignore(env.browsers(Browser.CHROME, Browser.EDGE)).it(
122+
'can listen to navigation started event',
123+
async function () {
124+
let navigationInfo = null
125+
const browsingConextInspector = await BrowsingContextInspector(driver)
125126

126-
await browsingConextInspector.onNavigationStarted((entry) => {
127-
navigationInfo = entry
128-
})
127+
await browsingConextInspector.onNavigationStarted((entry) => {
128+
navigationInfo = entry
129+
})
129130

130-
const browsingContext = await BrowsingContext(driver, {
131-
browsingContextId: await driver.getWindowHandle(),
132-
})
131+
const browsingContext = await BrowsingContext(driver, {
132+
browsingContextId: await driver.getWindowHandle(),
133+
})
133134

134-
await browsingContext.navigate(Pages.logEntryAdded, 'complete')
135+
await browsingContext.navigate(Pages.logEntryAdded, 'complete')
135136

136-
assert.equal(navigationInfo.browsingContextId, browsingContext.id)
137-
assert(navigationInfo.url.includes('/bidi/logEntryAdded.html'))
138-
})
137+
assert.equal(navigationInfo.browsingContextId, browsingContext.id)
138+
assert(navigationInfo.url.includes('/bidi/logEntryAdded.html'))
139+
},
140+
)
139141

140142
it('can listen to fragment navigated event', async function () {
141143
let navigationInfo = null
@@ -204,5 +206,5 @@ suite(
204206
})
205207
})
206208
},
207-
{ browsers: [Browser.FIREFOX] },
209+
{ browsers: [Browser.FIREFOX, Browser.CHROME, Browser.EDGE] },
208210
)

‎javascript/node/selenium-webdriver/test/bidi/browsingcontext_test.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
'use strict'
1919

2020
const assert = require('assert')
21-
const firefox = require('../../firefox')
2221
const { Browser, By } = require('../../')
23-
const { Pages, suite } = require('../../lib/test')
22+
const { Pages, suite, ignore } = require('../../lib/test')
2423
const BrowsingContext = require('../../bidi/browsingContext')
2524
const until = require('../../lib/until')
2625
const { Origin, CaptureScreenshotParameters } = require('../../bidi/captureScreenshotParameters')
@@ -31,7 +30,7 @@ suite(
3130
let driver
3231

3332
beforeEach(async function () {
34-
driver = await env.builder().setFirefoxOptions(new firefox.Options().enableBidi()).build()
33+
driver = await env.builder().build()
3534
})
3635

3736
afterEach(async function () {
@@ -403,7 +402,7 @@ suite(
403402
assert(result.url.includes('/bidi/logEntryAdded.html'))
404403
})
405404

406-
xit('can reload with readiness state', async function () {
405+
it('can reload with readiness state', async function () {
407406
const id = await driver.getWindowHandle()
408407
const browsingContext = await BrowsingContext(driver, {
409408
browsingContextId: id,
@@ -431,7 +430,7 @@ suite(
431430
assert.equal(result[1], 300)
432431
})
433432

434-
xit('can set viewport with device pixel ratio', async function () {
433+
ignore(env.browsers(Browser.FIREFOX)).it('can set viewport with device pixel ratio', async function () {
435434
const id = await driver.getWindowHandle()
436435
const browsingContext = await BrowsingContext(driver, {
437436
browsingContextId: id,
@@ -462,5 +461,5 @@ suite(
462461
})
463462
})
464463
},
465-
{ browsers: [Browser.FIREFOX] },
464+
{ browsers: [Browser.FIREFOX, Browser.CHROME, Browser.EDGE] },
466465
)

‎javascript/node/selenium-webdriver/test/bidi/input_test.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
const assert = require('assert')
2121
const fileServer = require('../../lib/test/fileserver')
22-
const firefox = require('../../firefox')
2322
const { ignore, Pages, suite } = require('../../lib/test')
2423
const { Key, Origin } = require('../../lib/input')
2524
const { Browser, By, until } = require('../..')
@@ -31,7 +30,7 @@ suite(
3130
let driver
3231

3332
beforeEach(async function () {
34-
driver = await env.builder().setFirefoxOptions(new firefox.Options().enableBidi()).build()
33+
driver = await env.builder().build()
3534
})
3635

3736
afterEach(function () {
@@ -168,7 +167,7 @@ suite(
168167
assert.strictEqual(await slide.getCssValue('left'), '101px')
169168
})
170169

171-
ignore(env.browsers(Browser.FIREFOX)).it('can move to and click element in an iframe', async function () {
170+
xit('can move to and click element in an iframe', async function () {
172171
const browsingContextId = await driver.getWindowHandle()
173172
const input = await Input(driver)
174173
await driver.get(fileServer.whereIs('click_tests/click_in_iframe.html'))
@@ -275,7 +274,7 @@ suite(
275274
assert.strictEqual(await el.getAttribute('value'), 'foobar')
276275
})
277276

278-
ignore(env.browsers(Browser.SAFARI)).it('can scroll with the wheel input', async function () {
277+
it('can scroll with the wheel input', async function () {
279278
const browsingContextId = await driver.getWindowHandle()
280279
const input = await Input(driver)
281280
await driver.get(Pages.scrollingPage)
@@ -323,5 +322,5 @@ suite(
323322
}
324323
})
325324
},
326-
{ browsers: [Browser.FIREFOX] },
325+
{ browsers: [Browser.FIREFOX, Browser.CHROME, Browser.EDGE] },
327326
)

‎javascript/node/selenium-webdriver/test/bidi/local_value_test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
'use strict'
1919

2020
const assert = require('assert')
21-
const firefox = require('../../firefox')
2221
const { Browser } = require('../../')
2322
const { suite } = require('../../lib/test')
2423

@@ -33,7 +32,7 @@ suite(
3332
let driver
3433

3534
beforeEach(async function () {
36-
driver = await env.builder().setFirefoxOptions(new firefox.Options().enableBidi()).build()
35+
driver = await env.builder().build()
3736
})
3837

3938
afterEach(async function () {
@@ -418,5 +417,5 @@ suite(
418417
})
419418
})
420419
},
421-
{ browsers: [Browser.FIREFOX] },
420+
{ browsers: [Browser.FIREFOX, Browser.CHROME, Browser.EDGE] },
422421
)

‎javascript/node/selenium-webdriver/test/bidi/locate_nodes_test.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ suite(
4141
})
4242

4343
describe('Locate Nodes', function () {
44-
xit('can locate nodes', async function () {
44+
it('can locate nodes', async function () {
4545
const id = await driver.getWindowHandle()
4646
const browsingContext = await BrowsingContext(driver, {
4747
browsingContextId: id,
@@ -53,7 +53,7 @@ suite(
5353
assert.strictEqual(element.length, 13)
5454
})
5555

56-
xit('can locate node', async function () {
56+
it('can locate node', async function () {
5757
const id = await driver.getWindowHandle()
5858
const browsingContext = await BrowsingContext(driver, {
5959
browsingContextId: id,
@@ -65,7 +65,7 @@ suite(
6565
assert.strictEqual(element.type, 'node')
6666
})
6767

68-
xit('can locate node with css locator', async function () {
68+
it('can locate node with css locator', async function () {
6969
const id = await driver.getWindowHandle()
7070
const browsingContext = await BrowsingContext(driver, {
7171
browsingContextId: id,
@@ -128,7 +128,7 @@ suite(
128128
assert.strictEqual(elements.length, 4)
129129
})
130130

131-
xit('can locate node with none ownership value', async function () {
131+
it('can locate node with none ownership value', async function () {
132132
const id = await driver.getWindowHandle()
133133
const browsingContext = await BrowsingContext(driver, {
134134
browsingContextId: id,
@@ -141,7 +141,7 @@ suite(
141141
assert.strictEqual(elements[0].handle, null)
142142
})
143143

144-
xit('can locate node with root ownership value', async function () {
144+
it('can locate node with root ownership value', async function () {
145145
const id = await driver.getWindowHandle()
146146
const browsingContext = await BrowsingContext(driver, {
147147
browsingContextId: id,
@@ -195,7 +195,7 @@ suite(
195195
assert.strictEqual(elements.length, 35)
196196
})
197197

198-
xit('can locate nodes in a given sandbox', async function () {
198+
it('can locate nodes in a given sandbox', async function () {
199199
const sandbox = 'sandbox'
200200
const id = await driver.getWindowHandle()
201201
const browsingContext = await BrowsingContext(driver, {
@@ -234,7 +234,7 @@ suite(
234234
assert.strictEqual(sharedId.value, nodeId)
235235
})
236236

237-
xit('can find element', async function () {
237+
it('can find element', async function () {
238238
const id = await driver.getWindowHandle()
239239
const browsingContext = await BrowsingContext(driver, {
240240
browsingContextId: id,
@@ -247,7 +247,7 @@ suite(
247247
assert.strictEqual(elementText, 'Open new window')
248248
})
249249

250-
xit('can find elements', async function () {
250+
it('can find elements', async function () {
251251
const id = await driver.getWindowHandle()
252252
const browsingContext = await BrowsingContext(driver, {
253253
browsingContextId: id,

‎javascript/node/selenium-webdriver/test/bidi/log_inspector_test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
'use strict'
1919

2020
const assert = require('assert')
21-
const firefox = require('../../firefox')
2221
const { Browser } = require('../../')
2322
const { Pages, suite } = require('../../lib/test')
2423
const logInspector = require('../../bidi/logInspector')
@@ -29,7 +28,7 @@ suite(
2928
let driver
3029

3130
beforeEach(async function () {
32-
driver = await env.builder().setFirefoxOptions(new firefox.Options().enableBidi()).build()
31+
driver = await env.builder().build()
3332
})
3433

3534
afterEach(async function () {

0 commit comments

Comments
 (0)