Skip to content

Commit 119181e

Browse files
cgoldbergcgoldberg
authored
Merge branch 'SeleniumHQ:trunk' into py-ruff
2 parents bb64a90 + 27017a8 commit 119181e

File tree

11 files changed

+832
-37
lines changed

11 files changed

+832
-37
lines changed

‎.skipped-tests‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,9 @@
1919
-//javascript/atoms:test-edge
2020
-//javascript/atoms:test-firefox-beta
2121
-//javascript/chrome-driver/...
22-
-//javascript/selenium-webdriver:test-bidi-network-test.js-chrome
2322
-//javascript/selenium-webdriver:test-builder-test.js-chrome
24-
-//javascript/selenium-webdriver:test-builder-test.js-firefox
2523
-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
26-
-//javascript/selenium-webdriver:test-chrome-options-test.js-chrome
27-
-//javascript/selenium-webdriver:test-chrome-service-test.js-chrome
2824
-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
29-
-//javascript/selenium-webdriver:test-lib-capabilities-test.js-chrome
3025
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome
3126
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
3227
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote

‎common/repositories.bzl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b2/linux-x86_64/en-US/firefox-139.0b2.tar.xz",
54-
sha256 = "c53561c12640003b6c1d3c2112e73227451f8e0a956b65be46cd1ca783e6efe1",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b3/linux-x86_64/en-US/firefox-139.0b3.tar.xz",
54+
sha256 = "8db541819ed4c06678e1678715c0d3f2cc43fba21c593dfc6a5f10c7674e98af",
5555
build_file_content = """
5656
load("@aspect_rules_js//js:defs.bzl", "js_library")
5757
package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
7272

7373
dmg_archive(
7474
name = "mac_beta_firefox",
75-
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b2/mac/en-US/Firefox%20139.0b2.dmg",
76-
sha256 = "8a30f4098db4d7053c923344b00fdfea6f7854ed9d819afd33161a7af48c7e32",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/139.0b3/mac/en-US/Firefox%20139.0b3.dmg",
76+
sha256 = "a7433bb645cbef9dd123afe8856060dbf6afaa1bab06d14298ebbc7d35968984",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/135.0.3179.98/edgedriver_linux64.zip",
169-
sha256 = "ea89d43034f86c70f37b9f580cd7bc5f18cb9537697af55e113b94c9dc766336",
168+
url = "https://msedgedriver.azureedge.net/136.0.3240.50/edgedriver_linux64.zip",
169+
sha256 = "c987f3334ab00366d3afea79bddb510367a3b81ead88ff808980d3ed6b86e4aa",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/135.0.3179.98/edgedriver_mac64.zip",
186-
sha256 = "5b8b5e019e432b86e49a4e1d8f3a312373a0c7ad88b84ae2419419d100f99fdb",
185+
url = "https://msedgedriver.azureedge.net/136.0.3240.50/edgedriver_mac64.zip",
186+
sha256 = "9c592695119986af76bd0182bc355716e29844dd97052f77865f55fffbf6db3d",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])

‎java/test/org/openqa/selenium/bidi/storage/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ java_selenium_test_suite(
88
browsers = [
99
"chrome",
1010
"firefox",
11+
"edge",
1112
],
1213
tags = [
1314
"selenium-remote",

‎java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public void setUp() {
6363
}
6464

6565
@Test
66-
@NotYetImplemented(EDGE)
6766
public void canGetCookieByName() {
6867
String key = generateUniqueKey();
6968
String value = "set";
@@ -124,7 +123,6 @@ public void canGetCookieInDefaultUserContext() {
124123
}
125124

126125
@Test
127-
@NotYetImplemented(EDGE)
128126
public void canGetCookieInAUserContext() {
129127
Browser browser = new Browser(driver);
130128
String userContext = browser.createUserContext();
@@ -177,7 +175,6 @@ key, new BytesValue(BytesValue.Type.STRING, value), appServer.getHostName()),
177175
}
178176

179177
@Test
180-
@NotYetImplemented(EDGE)
181178
public void canAddCookie() {
182179
String key = generateUniqueKey();
183180
String value = "foo";
@@ -289,7 +286,6 @@ public void canGetAllCookies() {
289286
}
290287

291288
@Test
292-
@NotYetImplemented(EDGE)
293289
public void canDeleteAllCookies() {
294290
addCookieOnServerSide(new Cookie("foo", "set"));
295291
assertSomeCookiesArePresent();
@@ -303,7 +299,6 @@ public void canDeleteAllCookies() {
303299
}
304300

305301
@Test
306-
@NotYetImplemented(EDGE)
307302
public void canDeleteCookieWithName() {
308303
String key1 = generateUniqueKey();
309304
String key2 = generateUniqueKey();
@@ -325,7 +320,6 @@ public void canDeleteCookieWithName() {
325320
}
326321

327322
@Test
328-
@NotYetImplemented(EDGE)
329323
public void testAddCookiesWithDifferentPathsThatAreRelatedToOurs() {
330324
driver.get(appServer.whereIs("/common/animals"));
331325

‎javascript/selenium-webdriver/test/chrome/devtools_test.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ test.suite(
3434
let driver
3535

3636
beforeEach(async function () {
37-
driver = await env.builder().setChromeOptions(new chrome.Options().addArguments('-headless')).build()
37+
let options = env.builder().getChromeOptions() || new chrome.Options()
38+
options.addArguments('--headless')
39+
driver = await env.builder().setChromeOptions(options).build()
3840
})
3941
afterEach(async () => await driver.quit())
4042

@@ -125,6 +127,7 @@ test.suite(
125127
await driver.register('random', 'random', pageCdpConnection)
126128
await driver.get(fileServer.Pages.basicAuth)
127129
let source = await driver.getPageSource()
130+
console.log(source)
128131
assert.strictEqual(source.includes('Access granted!'), false, source)
129132
})
130133
})

‎javascript/selenium-webdriver/test/chrome/options_test.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ test.suite(
123123

124124
describe('Chrome options', function () {
125125
it('can start Chrome with custom args', async function () {
126-
const options = new chrome.Options().addArguments('user-agent=foo;bar')
126+
const options = env.builder().getChromeOptions() || new chrome.Options()
127+
options.addArguments('user-agent=foo;bar')
127128

128129
driver = await env.builder().setChromeOptions(options).build()
129130

@@ -152,7 +153,8 @@ test.suite(
152153
})
153154

154155
it('can install an extension from path', async function () {
155-
let options = new chrome.Options().addExtensions(WEBEXTENSION_CRX)
156+
let options = env.builder().getChromeOptions() || new chrome.Options()
157+
options.addExtensions(WEBEXTENSION_CRX)
156158

157159
driver = await env.builder().forBrowser('chrome').setChromeOptions(options).build()
158160

@@ -161,7 +163,8 @@ test.suite(
161163
})
162164

163165
it('can install an extension from Buffer', async function () {
164-
let options = new chrome.Options().addExtensions(fs.readFileSync(WEBEXTENSION_CRX))
166+
let options = env.builder().getChromeOptions() || new chrome.Options()
167+
options.addExtensions(fs.readFileSync(WEBEXTENSION_CRX))
165168

166169
driver = await env.builder().forBrowser('chrome').setChromeOptions(options).build()
167170

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ suite(
6363

6464
describe('setProfile', function () {
6565
it('use profile with custom prefs', async function () {
66-
let options = new firefox.Options()
66+
let options = env.builder().getFirefoxOptions() || new firefox.Options()
6767
options.setProfile(profileWithUserPrefs)
6868

6969
driver = env.builder().setFirefoxOptions(options).build()
@@ -73,7 +73,7 @@ suite(
7373
})
7474

7575
it('use profile with extension', async function () {
76-
let options = new firefox.Options()
76+
let options = env.builder().getFirefoxOptions() || new firefox.Options()
7777
options.setProfile(profileWithWebExtension)
7878

7979
driver = env.builder().setFirefoxOptions(options).build()
@@ -116,7 +116,7 @@ suite(
116116
})
117117

118118
it('can start Firefox with custom preferences', async function () {
119-
let options = new firefox.Options()
119+
let options = env.builder().getFirefoxOptions() || new firefox.Options()
120120
options.setPreference('general.useragent.override', 'foo;bar')
121121

122122
driver = env.builder().setFirefoxOptions(options).build()
@@ -126,9 +126,9 @@ suite(
126126
})
127127

128128
it('can add extra prefs on top of an existing profile', async function () {
129-
let options = new firefox.Options()
130-
.setPreference('general.useragent.override', 'foo;bar')
131-
.setProfile(profileWithWebExtension)
129+
let options = env.builder().getFirefoxOptions() || new firefox.Options()
130+
options.setPreference('general.useragent.override', 'foo;bar')
131+
options.setProfile(profileWithWebExtension)
132132

133133
driver = env.builder().setFirefoxOptions(options).build()
134134

@@ -140,7 +140,7 @@ suite(
140140

141141
describe('addExtensions', function () {
142142
it('can add extension to brand new profile', async function () {
143-
let options = new firefox.Options()
143+
let options = env.builder().getFirefoxOptions() || new firefox.Options()
144144
options.addExtensions(EXT_XPI)
145145

146146
driver = env.builder().setFirefoxOptions(options).build()
@@ -150,7 +150,8 @@ suite(
150150
})
151151

152152
it('can add extension to custom profile', async function () {
153-
let options = new firefox.Options().addExtensions(EXT_XPI).setProfile(profileWithUserPrefs)
153+
let options = env.builder().getFirefoxOptions() || new firefox.Options()
154+
options.addExtensions(EXT_XPI).setProfile(profileWithUserPrefs)
154155

155156
driver = env.builder().setFirefoxOptions(options).build()
156157

@@ -160,9 +161,9 @@ suite(
160161
})
161162

162163
it('can addExtensions and setPreference', async function () {
163-
let options = new firefox.Options()
164-
.addExtensions(EXT_XPI)
165-
.setPreference('general.useragent.override', 'foo;bar')
164+
let options = env.builder().getFirefoxOptions() || new firefox.Options()
165+
options.addExtensions(EXT_XPI)
166+
options.setPreference('general.useragent.override', 'foo;bar')
166167

167168
driver = env.builder().setFirefoxOptions(options).build()
168169

@@ -172,7 +173,7 @@ suite(
172173
})
173174

174175
it('can load .zip webextensions', async function () {
175-
let options = new firefox.Options()
176+
let options = env.builder().getFirefoxOptions() || new firefox.Options()
176177
options.addExtensions(EXT_XPI)
177178

178179
driver = env.builder().setFirefoxOptions(options).build()

‎javascript/selenium-webdriver/test/lib/capabilities_test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ test.suite(function (env) {
142142
.it(
143143
'should fail to upload files to a non interactable input when StrictFileInteractability is on',
144144
async function () {
145-
const options = new chrome.Options()
145+
const options = env.builder().getChromeOptions() || new chrome.Options()
146146
options.setStrictFileInteractability(true)
147147
const driver = env.builder().setChromeOptions(options).build()
148148

@@ -181,7 +181,7 @@ test.suite(function (env) {
181181
return fp
182182
})
183183

184-
const options = new chrome.Options()
184+
const options = env.builder().getChromeOptions() || new chrome.Options()
185185
options.setStrictFileInteractability(false)
186186
const driver = env.builder().setChromeOptions(options).build()
187187

0 commit comments

Comments
 (0)