Skip to content

Commit 6ec0ac7

Browse files
authored
Merge branch 'SeleniumHQ:trunk' into feature/ft-16248-websocket-timeout
2 parents 53b667b + 3d15087 commit 6ec0ac7

File tree

228 files changed

+9333
-9390
lines changed

Some content is hidden

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

228 files changed

+9333
-9390
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ body:
5050
id: selenium-version
5151
attributes:
5252
label: What version of Selenium are you currently using?
53-
description: Important! The latest released version of Selenium is 4.35 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.36 and we can't fix old versions.
5454
placeholder: e.g., 4.17.0
5555
validations:
5656
required: true

.github/workflows/bazel.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ jobs:
126126
with:
127127
bazelisk-cache: true
128128
bazelrc: common --color=yes
129+
# Workaround for long path issues: https://github.com/bazelbuild/bazel/pull/22532
130+
output-base: ${{ inputs.os == 'windows' && 'D://b' || '' }}
129131
cache-version: 2
130132
disk-cache: ${{ inputs.cache-key }}
131133
external-cache: |

.github/workflows/ci-python.yml

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ jobs:
1111
with:
1212
name: Build
1313
cache-key: py-build
14-
run: bazel build //py:selenium-wheel //py:selenium-sdist
14+
run: |
15+
bazel build //py:selenium-wheel //py:selenium-sdist
1516
1617
docs:
1718
name: Documentation
@@ -29,7 +30,8 @@ jobs:
2930
python -m pip install --upgrade pip
3031
pip install tox==4.30.2
3132
- name: Generate docs
32-
run: tox -c py/tox.ini
33+
run: |
34+
tox -c py/tox.ini
3335
env:
3436
TOXENV: docs
3537

@@ -54,6 +56,23 @@ jobs:
5456
env:
5557
TOXENV: mypy
5658

59+
unit-tests:
60+
name: Unit Tests
61+
needs: build
62+
uses: ./.github/workflows/bazel.yml
63+
strategy:
64+
fail-fast: false
65+
matrix:
66+
include:
67+
- os: ubuntu
68+
- os: macos
69+
with:
70+
name: Unit Tests (${{ matrix.os }})
71+
os: ${{ matrix.os }}
72+
cache-key: python-unit-test-${{ matrix.os }}
73+
run: |
74+
bazel test //py:unit
75+
5776
remote-tests:
5877
name: Remote Tests
5978
needs: build
@@ -67,7 +86,8 @@ jobs:
6786
name: Integration Tests (remote, ${{ matrix.browser }})
6887
browser: ${{ matrix.browser }}
6988
cache-key: py-remote-${{ matrix.browser }}
70-
run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
89+
run: |
90+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
7191
7292
browser-tests:
7393
name: Browser Tests
@@ -89,10 +109,30 @@ jobs:
89109
os: ${{ matrix.os }}
90110
cache-key: py-browser-${{ matrix.browser }}
91111
run: |
92-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi
93-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
112+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
113+
114+
browser-tests-windows:
115+
name: Browser Tests
116+
needs: build
117+
uses: ./.github/workflows/bazel.yml
118+
strategy:
119+
fail-fast: false
120+
matrix:
121+
include:
122+
- browser: chrome
123+
os: windows
124+
- browser: edge
125+
os: windows
126+
with:
127+
name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
128+
browser: ${{ matrix.browser }}
129+
os: ${{ matrix.os }}
130+
cache-key: py-browser-${{ matrix.browser }}
131+
run: |
132+
fsutil 8dot3name set 0
133+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
94134
95-
safari-tests:
135+
browser-tests-macos:
96136
name: Browser Tests
97137
needs: build
98138
uses: ./.github/workflows/bazel.yml
@@ -108,4 +148,4 @@ jobs:
108148
os: ${{ matrix.os }}
109149
cache-key: py-browser-${{ matrix.browser }}
110150
run: |
111-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
151+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }} //py:test-${{ matrix.browser }}

.github/workflows/ci-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
matrix:
9797
include:
9898
- browser: edge
99-
os: windows
99+
os: macos
100100
with:
101101
name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
102102
browser: ${{ matrix.browser }}

AUTHORS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Andrii Rohovets <[email protected]>
7878
Andy Duncan <[email protected]>
7979
Angie Jones <[email protected]>
8080
anonymous_sdet <[email protected]>
81+
Anthony Richardson <[email protected]>
8182
Anthony Sottile <[email protected]>
8283
Anton Usmansky <[email protected]>
8384
Anton Velma <[email protected]>
@@ -318,6 +319,7 @@ GFHuang <[email protected]>
318319
319320
Ghjuvan Lacambre <[email protected]>
320321
Giorgos Tzampanakis <[email protected]>
322+
Giulio Longfils <[email protected]>
321323
322324
Glib Briia <[email protected]>
323325
Godefroid Chapelle
@@ -367,6 +369,7 @@ Iain Dawson <[email protected]>
367369
Ian Lesperance <[email protected]>
368370
ian zhang <[email protected]>
369371
Iaroslav Naidon <[email protected]>
372+
370373
371374
Ilya Kozhevnikov <[email protected]>
372375
Ilyas Bayraktar <[email protected]>
@@ -681,6 +684,7 @@ Nirantak Raghav <[email protected]>
681684
682685
Noel Gordon
683686
Noritaka Kobayashi <[email protected]>
687+
NoStory-py <[email protected]>
684688
Nowell Strite <[email protected]>
685689
Nozomi Ito <[email protected]>
686690
no_author <[email protected]>
@@ -703,6 +707,7 @@ Outsider <[email protected]>
703707
Paladin Wang <[email protected]>
704708
705709
Palmer Bandy <[email protected]>
710+
Paresh Gupta <[email protected]>
706711
Pat Tullmann <[email protected]>
707712
Patrice Jaton <[email protected]>
708713
Patrick Beart <[email protected]>
@@ -900,6 +905,7 @@ Ulf Adams <[email protected]>
900905
Ulrich Buchgraber <[email protected]>
901906
User253489 <[email protected]>
902907
908+
Vaibhav Gupta <[email protected]>
903909
Valery Yatsynovich <[email protected]>
904910
Varun Menon <[email protected]>
905911
varunsurapaneni <[email protected]>
@@ -908,6 +914,8 @@ vedanthvdev <[email protected]>
908914
909915
910916
Victor Tang <[email protected]>
917+
Victoria Ivanova <[email protected]>
918+
Victoria Ivanova <[email protected]>
911919
Viet Nguyen Duc <[email protected]>
912920
Vijay Singh <[email protected]>
913921
Vijendarn Selvarajah <[email protected]>

0 commit comments

Comments
 (0)