Skip to content

Commit 9cd6c45

Browse files
jimevansjimevans
committed
2 parents 0a6260d + 346da0e commit 9cd6c45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2598
-1685
lines changed

‎.github/workflows/java.yml

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
7373

7474
lint:
75-
needs: small_tests
75+
needs: build
7676
runs-on: ubuntu-latest
7777
steps:
7878
- name: Checkout source tree
@@ -120,7 +120,7 @@ jobs:
120120
uses: actions/setup-java@v1
121121
with:
122122
java-version: '11'
123-
- name: Setup Chrome and chromedriver
123+
- name: Setup Chrome and ChromeDriver
124124
uses: ./.github/actions/setup-chrome
125125
- name: Start XVFB
126126
run: Xvfb :99 &
@@ -153,20 +153,20 @@ jobs:
153153
uses: actions/setup-java@v1
154154
with:
155155
java-version: '11'
156-
- name: Setup Firefox and geckodriver
156+
- name: Setup Firefox and GeckoDriver
157157
uses: ./.github/actions/setup-firefox
158158
- name: Start XVFB
159159
run: Xvfb :99 &
160160
- name: Run browser tests in Firefox
161161
uses: ./.github/actions/bazel-test
162162
with:
163-
query: attr(tags, firefox, tests(//java/...)) except attr(tags, remote, tests(//java/...))
163+
query: attr(tags, firefox, tests(//java/...)) except attr(tags, 'rc|remote', tests(//java/...))
164164
env:
165165
DISPLAY: :99
166166

167167

168168
server_tests:
169-
needs: small_tests
169+
needs: [ chrome_tests, firefox_tests ]
170170
runs-on: ubuntu-latest
171171
steps:
172172
- name: Checkout source tree
@@ -177,8 +177,10 @@ jobs:
177177
path: |
178178
~/.cache/bazel-disk
179179
~/.cache/bazel-repo
180-
key: ${{ runner.os }}-bazel-firefox-tests-${{ hashFiles('**/BUILD.bazel') }}
180+
key: ${{ runner.os }}-bazel-server-tests-${{ hashFiles('**/BUILD.bazel') }}
181181
restore-keys: |
182+
${{ runner.os }}-bazel-server-tests-
183+
${{ runner.os }}-bazel-chrome-tests-
182184
${{ runner.os }}-bazel-firefox-tests-
183185
${{ runner.os }}-bazel-build-
184186
- name: Setup bazelisk
@@ -187,16 +189,49 @@ jobs:
187189
uses: actions/setup-java@v1
188190
with:
189191
java-version: '11'
190-
- name: Setup Chrome and chromedriver
192+
- name: Setup Chrome and ChromeDriver
191193
uses: ./.github/actions/setup-chrome
192-
- name: Setup Firefox and geckodriver
194+
- name: Setup Firefox and GeckoDriver
193195
uses: ./.github/actions/setup-firefox
194196
- name: Start XVFB
195197
run: Xvfb :99 &
196198
- name: Run server tests
197199
uses: ./.github/actions/bazel-test
198200
with:
199-
query: tests(//java/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/...))
201+
query: tests(//java/...) except attr(tags, 'rc|lint|ie|edge|edgehtml|safari', tests(//java/...))
202+
env:
203+
DISPLAY: :99
204+
205+
rc_tests:
206+
needs: small_tests
207+
runs-on: ubuntu-latest
208+
steps:
209+
- name: Checkout source tree
210+
uses: actions/checkout@v2
211+
- name: Cache Bazel artifacts
212+
uses: actions/cache@v2
213+
with:
214+
path: |
215+
~/.cache/bazel-disk
216+
~/.cache/bazel-repo
217+
key: ${{ runner.os }}-bazel-firefox-tests-${{ hashFiles('**/BUILD.bazel') }}
218+
restore-keys: |
219+
${{ runner.os }}-bazel-firefox-tests-
220+
${{ runner.os }}-bazel-build-
221+
- name: Setup bazelisk
222+
uses: ./.github/actions/setup-bazelisk
223+
- name: Setup Java
224+
uses: actions/setup-java@v1
225+
with:
226+
java-version: '11'
227+
- name: Setup Firefox and GeckoDriver
228+
uses: ./.github/actions/setup-firefox
229+
- name: Start XVFB
230+
run: Xvfb :99 &
231+
- name: Run browser tests in Firefox
232+
uses: ./.github/actions/bazel-test
233+
with:
234+
query: attr(tags, rc, tests(//java/...))
200235
env:
201236
DISPLAY: :99
202237

‎.github/workflows/python.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ jobs:
138138
uses: actions/setup-java@v1
139139
with:
140140
java-version: '11'
141+
- name: Setup Chrome and ChromeDriver
142+
uses: ./.github/actions/setup-chrome
141143
- name: Start XVFB
142144
run: Xvfb :99 &
143145
- name: Run browser tests in Chrome
@@ -173,7 +175,7 @@ jobs:
173175
uses: actions/setup-java@v1
174176
with:
175177
java-version: '11'
176-
- name: Setup Firefox and geckodriver
178+
- name: Setup Firefox and GeckoDriver
177179
uses: ./.github/actions/setup-firefox
178180
- name: Start XVFB
179181
run: Xvfb :99 &
@@ -210,7 +212,7 @@ jobs:
210212
uses: actions/setup-java@v1
211213
with:
212214
java-version: '11'
213-
- name: Setup Firefox and geckodriver
215+
- name: Setup Firefox and GeckoDriver
214216
uses: ./.github/actions/setup-firefox
215217
- name: Start XVFB
216218
run: Xvfb :99 &

‎.tours/bazel.tour

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"$schema": "https://aka.ms/codetour-schema",
3+
"title": "Bazel",
4+
"steps": [
5+
{
6+
"file": "WORKSPACE",
7+
"description": "This is the main file creating the Bazel Workspace for this repository",
8+
"line": 1
9+
},
10+
{
11+
"file": "WORKSPACE",
12+
"description": "These are the packages that support our rules and give us the extra functionality that we can use. There are a number of imported rules for different programming languages and extra features we need",
13+
"line": 11
14+
},
15+
{
16+
"file": "BUILD.bazel",
17+
"description": "These are aliases to some of the most common build targets. To build a target you can run `bazel build <alias>` e.g. `bazel build grid`",
18+
"line": 14
19+
}
20+
],
21+
"ref": "trunk"
22+
}

‎.tours/building-and-testing-the-python-bindings.tour

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"$schema": "https://aka.ms/codetour-schema",
3+
"title": "Building and Testing the Python Bindings",
4+
"steps": [
5+
{
6+
"file": "py/BUILD.bazel",
7+
"description": "Files, like this, can be found all over this repository and will have all the targets that we need. To access this file with bazel you will need to use bazel build|test|run //py:<targets below>",
8+
"line": 7
9+
},
10+
{
11+
"file": "py/BUILD.bazel",
12+
"description": "This is how we create the python library that will be used",
13+
"line": 69
14+
},
15+
{
16+
"file": "py/BUILD.bazel",
17+
"description": "This creates the Selenium wheel that is published. We can upload it with `twine`",
18+
"line": 110
19+
},
20+
{
21+
"file": "py/BUILD.bazel",
22+
"description": "This creates the targets we need when we want to use \"pinned browsers\". Using \"pinned browsers\" means bazel will download the necessary browser and the corresponding driver. To use this target you will do `bazel test //py:auto-<browser name> --//common:pin_browsers`",
23+
"line": 229
24+
},
25+
{
26+
"file": "py/BUILD.bazel",
27+
"description": "If you want to use targets that have the installed browser and the driver on the $PATH environment variables",
28+
"line": 255
29+
},
30+
{
31+
"file": "py/BUILD.bazel",
32+
"description": "This target is called from other targets and will generate the CDP libraries that we use within the Selenium Python Bindings",
33+
"line": 186
34+
},
35+
{
36+
"file": "py/BUILD.bazel",
37+
"description": "These are the dependencies for building and testing",
38+
"line": 17
39+
},
40+
{
41+
"file": "py/BUILD.bazel",
42+
"description": "Below are the JavaScript atoms we use for certain features like checking if an element if visible.",
43+
"line": 38
44+
}
45+
],
46+
"ref": "trunk"
47+
}

‎WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ pin_browsers()
259259

260260
http_archive(
261261
name = "bazelruby_rules_ruby",
262-
sha256 = "14861aed0c9be47577808757ce2e54aa7c729f58d4c99ed907834df2a2245c6d",
263-
strip_prefix = "rules_ruby-1-36893fe82ea490cb4cc0ec0a5542298e2b45fb1c",
264-
url = "https://github.com/p0deje/rules_ruby-1/archive/36893fe82ea490cb4cc0ec0a5542298e2b45fb1c.tar.gz",
262+
sha256 = "43e1dc0b747d51617dcbc02c15c4a1383cb572d58bef3accc10b9c8bd1e06b62",
263+
strip_prefix = "rules_ruby-2caa1f20d5ba22080af653470037c72bf219af45",
264+
url = "https://github.com/bazelruby/rules_ruby/archive/2caa1f20d5ba22080af653470037c72bf219af45.tar.gz",
265265
)
266266

267267
load(

‎dotnet/CHANGELOG

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
v4.1.0
2+
======
3+
* add CDP support for v96 and remove v93
4+
* Adding test configuration for Edge in IE Mode
5+
* Refactor registration and execution of custom WebDriver commands
6+
7+
18
v4.0.1
29
======
310
* Refactored WebSocket handling of CDP. The handling of sending and receiving

‎dotnet/selenium-dotnet-version.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BUILD FILE SYNTAX: STARLARK
22

3-
SE_VERSION = "4.0.1"
3+
SE_VERSION = "4.1.0"
44
ASSEMBLY_VERSION = "4.0.0.0"
55
SUPPORTED_NET_FRAMEWORKS = ["net45", "net46", "net47", "net48"]
66
SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0", "netstandard2.1", "net5.0"]

‎java/CHANGELOG

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
v4.1.0
2+
======
3+
4+
* Supported CDP versions: 85, 94, 95, 96
5+
* Removed USE_CHROMIUM from EdgeOptions as new Edge is the default
6+
* [grid] Fixed command completion for ZSH when using the Selenium Server
7+
* Pass WebDriver instead of Loggable to allow augmentation of HasLogEvents
8+
* [grid] Using a random port when "-1" is set as port number for the Selenium Server
9+
* Handle Json parsing error such that future messages are not blocked
10+
* [grid] Fix host option
11+
* Changing type of extraInfo from HashMap to ConcurrentHasMap to avoid
12+
ConcurrentModificationException while reading exception message by parallel threads
13+
* Add retry http request filter for transient errors.
14+
* Fix Javadoc code block formatting
15+
* [grid] Using non-loopback address when default config is used
16+
* Fix classloading error in host identifier
17+
118
v4.0.0
219
======
320

‎java/maven_deps.bzl

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
22
load("@rules_jvm_external//:specs.bzl", "maven")
33

44
def selenium_java_deps():
5-
netty_version = "4.1.67.Final"
6-
opentelemetry_version = "1.6.0"
5+
netty_version = "4.1.69.Final"
6+
opentelemetry_version = "1.9.0"
77

88
maven_install(
99
artifacts = [
@@ -12,18 +12,18 @@ def selenium_java_deps():
1212
maven.artifact(
1313
group = "com.github.spotbugs",
1414
artifact = "spotbugs",
15-
version = "4.4.0",
15+
version = "4.5.0",
1616
exclusions = [
1717
"org.slf4j:slf4j-api",
1818
],
1919
),
20-
"com.google.code.gson:gson:2.8.8",
20+
"com.google.code.gson:gson:2.8.9",
2121
"com.google.guava:guava:31.0.1-jre",
22-
"com.google.auto:auto-common:1.1.2",
23-
"com.google.auto.service:auto-service:1.0",
24-
"com.google.auto.service:auto-service-annotations:1.0",
25-
"com.graphql-java:graphql-java:16.2",
26-
"io.grpc:grpc-context:1.41.0",
22+
"com.google.auto:auto-common:1.2.1",
23+
"com.google.auto.service:auto-service:1.0.1",
24+
"com.google.auto.service:auto-service-annotations:1.0.1",
25+
"com.graphql-java:graphql-java:17.0",
26+
"io.grpc:grpc-context:1.42.1",
2727
"io.lettuce:lettuce-core:6.1.5.RELEASE",
2828
"io.netty:netty-buffer:%s" % netty_version,
2929
"io.netty:netty-codec-haproxy:%s" % netty_version,
@@ -61,23 +61,23 @@ def selenium_java_deps():
6161
"org.hamcrest:hamcrest-library",
6262
],
6363
),
64-
"net.bytebuddy:byte-buddy:1.11.19",
64+
"net.bytebuddy:byte-buddy:1.12.1",
6565
"net.jodah:failsafe:2.4.4",
66-
"net.sourceforge.htmlunit:htmlunit-core-js:2.53.0",
66+
"net.sourceforge.htmlunit:htmlunit-core-js:2.55.0",
6767
"org.apache.commons:commons-exec:1.3",
6868
"org.assertj:assertj-core:3.21.0",
6969
"org.asynchttpclient:async-http-client:2.12.3",
7070
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
7171
"org.hamcrest:hamcrest:2.2",
72-
"org.hsqldb:hsqldb:2.6.0",
72+
"org.hsqldb:hsqldb:2.6.1",
7373
"org.mockito:mockito-core:4.0.0",
7474
"org.slf4j:slf4j-api:1.7.32",
7575
"org.slf4j:slf4j-jdk14:1.7.32",
7676
"org.testng:testng:7.4.0",
7777
"org.zeromq:jeromq:0.5.2",
7878
"xyz.rogfam:littleproxy:2.0.5",
79-
"org.seleniumhq.selenium:htmlunit-driver:2.53.0",
80-
"org.redisson:redisson:3.16.3",
79+
"org.seleniumhq.selenium:htmlunit-driver:3.55.0",
80+
"org.redisson:redisson:3.16.4",
8181
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
8282
],
8383
excluded_artifacts = [

0 commit comments

Comments
 (0)