Skip to content

Commit 4e3e8cb

Browse files
authored
[js] fix JS tests on RBE (#16777)
[js] get tests passing on RBE
1 parent 5b10f14 commit 4e3e8cb

File tree

4 files changed

+26
-65
lines changed

4 files changed

+26
-65
lines changed

.skipped-tests

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
-//java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest
2121
-//java/test/org/openqa/selenium/remote:RemoteWebDriverScreenshotTest-remote
2222
-//javascript/chrome-driver/...
23-
-//javascript/selenium-webdriver:test-builder-test.js-chrome
24-
-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
25-
-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
2623
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome
2724
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote
2825
-//rb/spec/integration/selenium/webdriver/edge:service-edge

javascript/selenium-webdriver/lib/webdriver.js

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,20 +1380,12 @@ class WebDriver {
13801380
}
13811381
})
13821382

1383-
await connection.execute(
1384-
'Fetch.enable',
1385-
{
1386-
handleAuthRequests: true,
1387-
},
1388-
null,
1389-
)
1390-
await connection.execute(
1391-
'Network.setCacheDisabled',
1392-
{
1393-
cacheDisabled: true,
1394-
},
1395-
null,
1396-
)
1383+
await connection.send('Fetch.enable', {
1384+
handleAuthRequests: true,
1385+
})
1386+
await connection.send('Network.setCacheDisabled', {
1387+
cacheDisabled: true,
1388+
})
13971389
}
13981390

13991391
/**
@@ -1563,15 +1555,11 @@ class WebDriver {
15631555
connection = this._cdpConnection
15641556
}
15651557

1566-
await connection.execute('Page.enable', {}, null)
1558+
await connection.send('Page.enable', {})
15671559

1568-
await connection.execute(
1569-
'Runtime.evaluate',
1570-
{
1571-
expression: pinnedScript.creationScript(),
1572-
},
1573-
null,
1574-
)
1560+
await connection.send('Runtime.evaluate', {
1561+
expression: pinnedScript.creationScript(),
1562+
})
15751563

15761564
let result = await connection.send('Page.addScriptToEvaluateOnNewDocument', {
15771565
source: pinnedScript.creationScript(),
@@ -1597,23 +1585,15 @@ class WebDriver {
15971585
connection = this._cdpConnection
15981586
}
15991587

1600-
await connection.execute('Page.enable', {}, null)
1588+
await connection.send('Page.enable', {})
16011589

1602-
await connection.execute(
1603-
'Runtime.evaluate',
1604-
{
1605-
expression: script.removalScript(),
1606-
},
1607-
null,
1608-
)
1590+
await connection.send('Runtime.evaluate', {
1591+
expression: script.removalScript(),
1592+
})
16091593

1610-
await connection.execute(
1611-
'Page.removeScriptToEvaluateOnLoad',
1612-
{
1613-
identifier: script.scriptId,
1614-
},
1615-
null,
1616-
)
1594+
await connection.send('Page.removeScriptToEvaluateOnLoad', {
1595+
identifier: script.scriptId,
1596+
})
16171597

16181598
delete this.pinnedScripts_[script.handle]
16191599
}

javascript/selenium-webdriver/test/builder_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ test.suite(function (env) {
7171

7272
it(env.browser.name, async function () {
7373
let timeouts = { implicit: 0, pageLoad: 1000, script: 1000 }
74-
driver = new Builder().setCapability('timeouts', timeouts).forBrowser(env.browser.name).build()
74+
driver = env.builder().setCapability('timeouts', timeouts).build()
7575

7676
let caps = await getCaps(driver)
7777
assert.deepEqual(caps.get('timeouts'), timeouts)

javascript/selenium-webdriver/test/firefox/options_test.js

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ const { locate } = require('../../lib/test/resources')
2727
const { until, By } = require('selenium-webdriver/index')
2828

2929
const EXT_XPI = locate('common/extensions/webextensions-selenium-example.xpi')
30-
const WEBEXTENSION_EXTENSION_ID = '[email protected]'
3130

3231
suite(
3332
function (env) {
@@ -43,16 +42,8 @@ suite(
4342
})
4443

4544
describe('Options', function () {
46-
let profileWithWebExtension
4745
let profileWithUserPrefs
4846

49-
before(async function createProfileWithWebExtension() {
50-
profileWithWebExtension = await io.tmpDir()
51-
let extensionsDir = path.join(profileWithWebExtension, 'extensions')
52-
await io.mkdir(extensionsDir)
53-
await io.write(path.join(extensionsDir, WEBEXTENSION_EXTENSION_ID), await io.read(EXT_XPI))
54-
})
55-
5647
before(async function createProfileWithUserPrefs() {
5748
profileWithUserPrefs = await io.tmpDir()
5849
await io.write(
@@ -71,16 +62,6 @@ suite(
7162
await driver.get(Pages.echoPage)
7263
await verifyUserAgentWasChanged()
7364
})
74-
75-
it('use profile with extension', async function () {
76-
let options = env.builder().getFirefoxOptions() || new firefox.Options()
77-
options.setProfile(profileWithWebExtension)
78-
79-
driver = env.builder().setFirefoxOptions(options).build()
80-
81-
await driver.get(Pages.echoPage)
82-
await verifyWebExtensionWasInstalled()
83-
})
8465
})
8566

8667
describe('set mobile options', function () {
@@ -127,14 +108,13 @@ suite(
127108

128109
it('can add extra prefs on top of an existing profile', async function () {
129110
let options = env.builder().getFirefoxOptions() || new firefox.Options()
130-
options.setPreference('general.useragent.override', 'foo;bar')
131-
options.setProfile(profileWithWebExtension)
111+
options.setPreference('general.useragent.override', 'baz;qux')
112+
options.setProfile(profileWithUserPrefs)
132113

133114
driver = env.builder().setFirefoxOptions(options).build()
134115

135116
await driver.get(Pages.echoPage)
136-
await verifyWebExtensionWasInstalled()
137-
await verifyUserAgentWasChanged()
117+
await verifyUserAgent('baz;qux')
138118
})
139119
})
140120

@@ -185,8 +165,12 @@ suite(
185165
})
186166

187167
async function verifyUserAgentWasChanged() {
168+
await verifyUserAgent('foo;bar')
169+
}
170+
171+
async function verifyUserAgent(expected) {
188172
let userAgent = await driver.executeScript('return window.navigator.userAgent')
189-
assert.strictEqual(userAgent, 'foo;bar')
173+
assert.strictEqual(userAgent, expected)
190174
}
191175

192176
async function verifyWebExtensionWasInstalled() {

0 commit comments

Comments
 (0)