Skip to content

Commit 59b60de

Browse files
authored
Merge branch 'trunk' into rb_add_support_for_chrome_beta
2 parents 4679e55 + 0b19300 commit 59b60de

File tree

4 files changed

+34
-27
lines changed

4 files changed

+34
-27
lines changed

java/test/org/openqa/selenium/edge/EdgeDriverFunctionalTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void canSetPermission() {
116116
@NoDriverBeforeTest
117117
public void canSetPermissionHeadless() {
118118
EdgeOptions options = new EdgeOptions();
119-
options.addArguments("--headless=new");
119+
options.addArguments("--headless");
120120

121121
localDriver = new WebDriverBuilder().get(options);
122122
HasPermissions permissions = (HasPermissions) localDriver;

java/test/org/openqa/selenium/testing/drivers/Browser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public Capabilities getCapabilities() {
5050
}
5151

5252
if (Boolean.getBoolean("webdriver.headless")) {
53-
options.addArguments("--headless=new");
53+
options.addArguments("--headless");
5454
}
5555

5656
options.addArguments(
@@ -84,7 +84,7 @@ public Capabilities getCapabilities() {
8484
}
8585

8686
if (Boolean.getBoolean("webdriver.headless")) {
87-
options.addArguments("--headless=new");
87+
options.addArguments("--headless");
8888
}
8989

9090
options.addArguments(

py/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ def get_options(driver_class, config):
229229

230230
if headless:
231231
if driver_class == "Chrome" or driver_class == "Edge":
232-
options.add_argument("--headless=new")
232+
options.add_argument("--headless")
233233
if driver_class == "Firefox":
234234
options.add_argument("-headless")
235235

@@ -393,6 +393,6 @@ def chromium_options(request):
393393
options = webdriver.EdgeOptions()
394394

395395
if request.config.option.headless:
396-
options.add_argument("--headless=new")
396+
options.add_argument("--headless")
397397

398398
return options

py/tox.ini

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
11
[tox]
2-
envlist = docs, flake8, isort, validate-pyproject
2+
envlist =
3+
validate
4+
linting
35

4-
[testenv:validate-pyproject]
6+
7+
[testenv:validate]
58
skip_install = true
69
deps =
7-
validate-pyproject==0.24.1
8-
packaging==25.0
10+
validate-pyproject==0.24.1
11+
packaging==25.0
912
commands =
10-
validate-pyproject ./pyproject.toml
13+
validate-pyproject ./pyproject.toml
14+
1115

1216
[testenv:docs]
1317
skip_install = true
1418
deps =
15-
-r {toxinidir}/docs/requirements.txt
16-
-r {toxinidir}/requirements.txt
19+
-r {toxinidir}/docs/requirements.txt
20+
-r {toxinidir}/requirements.txt
1721
commands =
18-
; generate `docs/source/api.rst` with module listing
19-
{envpython} ./generate_api_module_listing.py
20-
; regenerate autodoc stub pages
21-
sphinx-autogen docs/source/api.rst
22-
; build api docs
23-
sphinx-build -b html -d ../build/docs/doctrees docs/source ../build/docs/api/py {posargs}
22+
# generate `docs/source/api.rst` with module listing
23+
{envpython} ./generate_api_module_listing.py
24+
# regenerate autodoc stub pages
25+
sphinx-autogen docs/source/api.rst
26+
# build api docs
27+
sphinx-build -b html -d ../build/docs/doctrees docs/source ../build/docs/api/py {posargs}
2428
setenv =
2529
PYTHONPATH = {toxinidir}/.
2630

31+
2732
[testenv:mypy]
2833
skip_install = true
2934
deps =
30-
mypy==1.15.0
31-
lxml==5.3.2
32-
types-urllib3==1.26.25
33-
types-certifi==2021.10.8.3
34-
trio-typing==0.10.0
35-
commands = mypy --install-types {posargs}
35+
mypy==1.15.0
36+
lxml==5.3.2
37+
types-urllib3==1.26.25
38+
types-certifi==2021.10.8.3
39+
trio-typing==0.10.0
40+
commands =
41+
mypy --install-types {posargs}
42+
3643

3744
[testenv:linting]
3845
skip_install = true
3946
deps =
40-
ruff==0.11.12
47+
ruff==0.11.12
4148
commands =
42-
ruff check --fix --show-fixes --exit-non-zero-on-fix .
43-
ruff format --exit-non-zero-on-format .
49+
ruff check --fix --show-fixes --exit-non-zero-on-fix .
50+
ruff format --exit-non-zero-on-format .

0 commit comments

Comments
 (0)