Skip to content

Commit 283f4af

Browse files
VietND96VietND96
authored
Merge branch 'trunk' into trunk
2 parents 0c6e98e + 0f7386e commit 283f4af

File tree

25 files changed

+437
-76
lines changed

25 files changed

+437
-76
lines changed

‎.github/workflows/pre-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ jobs:
8080
run: git reset HEAD~1
8181
- name: Update everything including early release CDP
8282
if: ${{ github.event.inputs.chrome_channel == 'early-stable' }}
83-
run: ./go all:prepare['Beta']
83+
run: ./go all:prepare[${{ github.event.inputs.version }},Beta]
8484
- name: Update everything including released CDP
8585
if: ${{ github.event.inputs.chrome_channel == 'stable' }}
86-
run: ./go "all:prepare[Stable]"
86+
run: ./go "all:prepare[${{ github.event.inputs.version }},Stable]"
8787
- name: Create Pull Request
8888
uses: peter-evans/create-pull-request@v6
8989
with:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ py/selenium/webdriver/remote/isDisplayed.js
7676
py/docs/build/
7777
py/build/
7878
py/LICENSE
79+
py/pytestdebug.log
7980
selenium.egg-info/
8081
third_party/java/jetty/jetty-repacked.jar
8182
*.user

‎Rakefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,8 +1071,9 @@ namespace :all do
10711071
end
10721072

10731073
desc 'Update everything in preparation for a release'
1074-
task :prepare, [:channel] do |_task, arguments|
1074+
task :prepare, [:version, :channel] do |_task, arguments|
10751075
chrome_channel = arguments[:channel] || 'Stable'
1076+
version = arguments[:version]
10761077
args = Array(chrome_channel) ? ['--', "--chrome_channel=#{chrome_channel.capitalize}"] : []
10771078
Bazel.execute('run', args, '//scripts:pinned_browsers')
10781079
commit!('Update pinned browser versions', ['common/repositories.bzl'])
@@ -1102,7 +1103,7 @@ namespace :all do
11021103
commit!('Update authors file', ['AUTHORS'])
11031104

11041105
# Note that this does not include Rust version changes that are handled in separate rake:version task
1105-
Rake::Task['all:version'].invoke
1106+
Rake::Task['all:version'].invoke(version)
11061107
commit!("FIX CHANGELOGS BEFORE MERGING!\n\nUpdate versions and change logs to release Selenium #{java_version}",
11071108
['dotnet/CHANGELOG',
11081109
'dotnet/selenium-dotnet-version.bzl',

‎common/repositories.bzl‎

Lines changed: 13 additions & 13 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/128.0b3/linux-x86_64/en-US/firefox-128.0b3.tar.bz2",
54-
sha256 = "a44bd8e6c0cbdf28e270190f5dcaab0b803103509f556619047990551b7bea2d",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/128.0b4/linux-x86_64/en-US/firefox-128.0b4.tar.bz2",
54+
sha256 = "1cbcc0b831db1b28cc27122de8925ccc776c11a351e211b8c9361c7392de222b",
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/128.0b3/mac/en-US/Firefox%20128.0b3.dmg",
76-
sha256 = "8941d09bfc01cf0bae0ebd82c93b0a03eeceea374152c4c1d448fd45911311bb",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/128.0b4/mac/en-US/Firefox%20128.0b4.dmg",
76+
sha256 = "716aa0ee6dff66fd4f0a0183ef91ba5a2ebfcdc16595c5e6c236fd5e4c6f455d",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
123123

124124
pkg_archive(
125125
name = "mac_edge",
126-
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/afca7d24-09f1-4c8b-825b-0e043b6ad3eb/MicrosoftEdge-126.0.2592.56.pkg",
127-
sha256 = "ab7c962acd1effed05fb71c91e098360299163197a7e2111dfeac1f420430046",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/7f06ea4d-1753-4d40-aab4-edf087546165/MicrosoftEdge-126.0.2592.61.pkg",
127+
sha256 = "ebadb7f4095b98cb627663bff918f3a7f2601462058fdac65a78818dabd1f68e",
128128
move = {
129-
"MicrosoftEdge-126.0.2592.56.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-126.0.2592.61.pkg/Payload/Microsoft Edge.app": "Edge.app",
130130
},
131131
build_file_content = """
132132
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
143143

144144
deb_archive(
145145
name = "linux_edge",
146-
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_126.0.2592.56-1_amd64.deb",
147-
sha256 = "3592e53c6819a3ca3319648b0f8cf31446bcbe22aad5cf16d71c963ae6918d76",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_126.0.2592.61-1_amd64.deb",
147+
sha256 = "ee0a6adf6dd341ea7570497198ab2a58fb6331c881f999c4f2cecb8d89ca9cdb",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
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/125.0.2535.92/edgedriver_linux64.zip",
169-
sha256 = "0110e7a091787f3d723ad8dfedcedda3e2b1b9bee6f34e9020da0af10308eaa1",
168+
url = "https://msedgedriver.azureedge.net/126.0.2592.61/edgedriver_linux64.zip",
169+
sha256 = "9b99973dd92d8e1115c6d317f7e3a9586125abb57c4c19a7f14c755ecc1b8cb4",
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/125.0.2535.92/edgedriver_mac64.zip",
186-
sha256 = "fcc1057325be98312f6ad66638fde0195c5a88eee87be31c5a63ccd9154c361b",
185+
url = "https://msedgedriver.azureedge.net/126.0.2592.61/edgedriver_mac64.zip",
186+
sha256 = "df6c180720a152b3f7096426cfb722a4ebc4c35715f3e15641323fb45c3c57e6",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])

‎dotnet/src/support/WebDriver.Support.StrongNamed.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>$packageid$</id>
55
<version>$version$</version>
66
<authors>Selenium Committers</authors>
7-
<copyright>Copyright © 2023 Software Freedom Conservancy</copyright>
7+
<copyright>Copyright © 2024 Software Freedom Conservancy</copyright>
88
<owners>selenium</owners>
99
<title>WebDriver Support</title>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎dotnet/src/support/WebDriver.Support.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>$packageid$</id>
55
<version>$version$</version>
66
<authors>Selenium Committers</authors>
7-
<copyright>Copyright © 2023 Software Freedom Conservancy</copyright>
7+
<copyright>Copyright © 2024 Software Freedom Conservancy</copyright>
88
<owners>selenium</owners>
99
<title>WebDriver Support</title>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎dotnet/src/webdriver/WebDriver.StrongNamed.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>$packageid$</id>
55
<version>$version$</version>
66
<authors>Selenium Committers</authors>
7-
<copyright>Copyright © 2023 Software Freedom Conservancy</copyright>
7+
<copyright>Copyright © 2024 Software Freedom Conservancy</copyright>
88
<owners>selenium</owners>
99
<title>Selenium WebDriver</title>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎dotnet/src/webdriver/WebDriver.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>$packageid$</id>
55
<version>$version$</version>
66
<authors>Selenium Committers</authors>
7-
<copyright>Copyright © 2023 Software Freedom Conservancy</copyright>
7+
<copyright>Copyright © 2024 Software Freedom Conservancy</copyright>
88
<owners>selenium</owners>
99
<title>Selenium WebDriver</title>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎java/test/org/openqa/selenium/bidi/input/DefaultKeyboardTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static org.junit.jupiter.api.Assumptions.assumeFalse;
2222
import static org.openqa.selenium.testing.TestUtilities.getEffectivePlatform;
2323
import static org.openqa.selenium.testing.drivers.Browser.CHROME;
24+
import static org.openqa.selenium.testing.drivers.Browser.EDGE;
2425
import static org.openqa.selenium.testing.drivers.Browser.IE;
2526
import static org.openqa.selenium.testing.drivers.Browser.SAFARI;
2627

@@ -200,6 +201,9 @@ void canGenerateKeyboardShortcuts() {
200201
@NotYetImplemented(
201202
value = CHROME,
202203
reason = "https://github.com/GoogleChromeLabs/chromium-bidi/issues/2321")
204+
@NotYetImplemented(
205+
value = EDGE,
206+
reason = "https://github.com/GoogleChromeLabs/chromium-bidi/issues/2321")
203207
public void testSelectionSelectBySymbol() {
204208
driver.get(appServer.whereIs("single_text_input.html"));
205209

@@ -229,6 +233,9 @@ public void testSelectionSelectBySymbol() {
229233
@NotYetImplemented(
230234
value = CHROME,
231235
reason = "https://github.com/GoogleChromeLabs/chromium-bidi/issues/2321")
236+
@NotYetImplemented(
237+
value = EDGE,
238+
reason = "https://github.com/GoogleChromeLabs/chromium-bidi/issues/2321")
232239
public void testSelectionSelectByWord() {
233240
assumeFalse(getEffectivePlatform(driver).is(Platform.MAC), "MacOS has alternative keyboard");
234241

‎py/BUILD.bazel‎

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ py_package(
214214
"py.selenium.webdriver.chrome",
215215
"py.selenium.webdriver.chromium",
216216
"py.selenium.webdriver.common",
217+
"py.selenium.webdriver.common.bidi",
217218
"py.selenium.webdriver.common.devtools",
218219
"py.selenium.webdriver.edge",
219220
"py.selenium.webdriver.firefox",
@@ -380,10 +381,39 @@ py_library(
380381
deps = [],
381382
)
382383

384+
BIDI_TESTS = glob(["test/selenium/webdriver/common/**/*bidi*_tests.py"])
385+
383386
[
384387
py_test_suite(
385388
name = "common-%s" % browser,
386389
size = "large",
390+
srcs = glob(
391+
[
392+
"test/selenium/webdriver/common/**/*.py",
393+
"test/selenium/webdriver/support/**/*.py",
394+
],
395+
exclude = BIDI_TESTS + ["test/selenium/webdriver/common/print_pdf_tests.py"],
396+
),
397+
args = [
398+
"--instafail",
399+
"--bidi=false",
400+
] + BROWSERS[browser]["args"],
401+
data = BROWSERS[browser]["data"],
402+
env_inherit = ["DISPLAY"],
403+
tags = ["no-sandbox"] + BROWSERS[browser]["tags"],
404+
deps = [
405+
":init-tree",
406+
":selenium",
407+
":webserver",
408+
] + TEST_DEPS,
409+
)
410+
for browser in BROWSERS.keys()
411+
]
412+
413+
[
414+
py_test_suite(
415+
name = "common-%s-bidi" % browser,
416+
size = "large",
387417
srcs = glob(
388418
[
389419
"test/selenium/webdriver/common/**/*.py",
@@ -393,12 +423,11 @@ py_library(
393423
),
394424
args = [
395425
"--instafail",
426+
"--bidi=true",
396427
] + BROWSERS[browser]["args"],
397428
data = BROWSERS[browser]["data"],
398429
env_inherit = ["DISPLAY"],
399-
tags = [
400-
"no-sandbox",
401-
] + BROWSERS[browser]["tags"],
430+
tags = ["no-sandbox"] + BROWSERS[browser]["tags"],
402431
deps = [
403432
":init-tree",
404433
":selenium",
@@ -504,10 +533,13 @@ py_test_suite(
504533
py_test_suite(
505534
name = "test-remote",
506535
size = "large",
507-
srcs = glob([
508-
"test/selenium/webdriver/common/**/*.py",
509-
"test/selenium/webdriver/support/**/*.py",
510-
]),
536+
srcs = glob(
537+
[
538+
"test/selenium/webdriver/common/**/*.py",
539+
"test/selenium/webdriver/support/**/*.py",
540+
],
541+
exclude = BIDI_TESTS,
542+
),
511543
args = [
512544
"--instafail",
513545
"--driver=remote",

0 commit comments

Comments
 (0)