Skip to content

Commit 0a92fa8

Browse files
authored
Merge branch 'trunk' into renovate/gradle-8.x
2 parents d97f2db + b737aed commit 0a92fa8

File tree

27 files changed

+179
-42
lines changed

27 files changed

+179
-42
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package dev.selenium.selenium_manager;
2+
3+
import org.junit.jupiter.api.Test;
4+
import org.openqa.selenium.WebDriver;
5+
import org.openqa.selenium.chrome.ChromeDriver;
6+
7+
public class SeleniumManagerUsageDemo {
8+
9+
@Test
10+
public void testSetupWithoutManager() {
11+
System.setProperty("webdriver.chrome.driver", "/path/to/chromedriver");
12+
WebDriver driver = new ChromeDriver();
13+
driver.get("https://www.selenium.dev/documentation/selenium_manager/");
14+
driver.quit();
15+
}
16+
17+
@Test
18+
public void testSetupWithManager() {
19+
WebDriver driver = new ChromeDriver();
20+
driver.get("https://www.selenium.dev/documentation/selenium_manager/");
21+
driver.quit();
22+
}
23+
24+
}

examples/kotlin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<kotlin.version>2.0.21</kotlin.version>
1313

1414
<slf4j.version>2.0.16</slf4j.version>
15-
<logback.version>1.5.14</logback.version>
15+
<logback.version>1.5.16</logback.version>
1616

1717
<junit5.version>5.11.4</junit5.version>
1818
<wdm.version>5.2.3</wdm.version>

examples/python/tests/browsers/test_safari.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def test_basic_options():
1414

1515
@pytest.mark.skipif(sys.platform != "darwin", reason="requires Mac")
1616
def test_enable_logging():
17-
service = webdriver.SafariService(service_args=["--diagnose"])
17+
service = webdriver.SafariService(enable_logging=True)
1818

1919
driver = webdriver.Safari(service=service)
2020

examples/python/tests/interactions/test_print_options.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ def test_range(driver):
2323
def test_size(driver):
2424
driver.get("https://www.selenium.dev/")
2525
print_options = PrintOptions()
26-
print_options.scale = 0.5 ## 0.1 to 2.0``
27-
assert print_options.scale == 0.5
26+
print_options.page_height = 27.94 # Use page_width to assign width
27+
assert print_options.page_height == 27.94
2828

2929
def test_margin(driver):
3030
driver.get("https://www.selenium.dev/")

examples/ruby/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ GEM
44
ast (2.4.2)
55
base64 (0.2.0)
66
diff-lcs (1.5.1)
7-
json (2.9.0)
7+
json (2.9.1)
88
language_server-protocol (3.17.0.3)
99
logger (1.6.1)
1010
parallel (1.26.3)
@@ -14,7 +14,7 @@ GEM
1414
racc (1.8.1)
1515
rainbow (3.1.1)
1616
rake (13.2.1)
17-
regexp_parser (2.9.3)
17+
regexp_parser (2.10.0)
1818
rexml (3.3.9)
1919
rspec (3.13.0)
2020
rspec-core (~> 3.13.0)
@@ -29,7 +29,7 @@ GEM
2929
diff-lcs (>= 1.2.0, < 2.0)
3030
rspec-support (~> 3.13.0)
3131
rspec-support (3.13.0)
32-
rubocop (1.69.2)
32+
rubocop (1.70.0)
3333
json (~> 2.3)
3434
language_server-protocol (>= 3.17.0)
3535
parallel (~> 1.10)
@@ -39,7 +39,7 @@ GEM
3939
rubocop-ast (>= 1.36.2, < 2.0)
4040
ruby-progressbar (~> 1.7)
4141
unicode-display_width (>= 2.4.0, < 4.0)
42-
rubocop-ast (1.36.2)
42+
rubocop-ast (1.37.0)
4343
parser (>= 3.3.1.0)
4444
rubocop-rspec (3.3.0)
4545
rubocop (~> 1.61)

website_and_docs/content/documentation/selenium_manager.en.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,11 @@ INFO Browser path: C:\Users\boni\.cache\selenium\chrome\win64\117.0.5938.22\c
219219
### Implementing Selenium Manager in Your Scripts
220220

221221
{{< tabpane text=true >}}
222-
{{< tab header="Java" >}}
223-
{{< badge-code >}}
222+
{{% tab header="Java" %}}
223+
**Previously**
224+
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/selenium_manager/SeleniumManagerUsageDemo.java#L10-L15" >}}
225+
**Selenium Manager**
226+
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/selenium_manager/SeleniumManagerUsageDemo.java#L18-L22" >}}
224227
{{< /tab >}}
225228
{{% tab header="Python" %}}
226229
**Previously**

website_and_docs/content/documentation/selenium_manager.ja.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,11 @@ INFO Browser path: C:\Users\boni\.cache\selenium\chrome\win64\117.0.5938.22\c
219219
### Implementing Selenium Manager in Your Scripts
220220

221221
{{< tabpane text=true >}}
222-
{{< tab header="Java" >}}
223-
{{< badge-code >}}
222+
{{% tab header="Java" %}}
223+
**Previously**
224+
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/selenium_manager/SeleniumManagerUsageDemo.java#L10-L15" >}}
225+
**Selenium Manager**
226+
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/selenium_manager/SeleniumManagerUsageDemo.java#L18-L22" >}}
224227
{{< /tab >}}
225228
{{% tab header="Python" %}}
226229
**Previously**

website_and_docs/content/documentation/selenium_manager.pt-br.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,11 @@ INFO Browser path: C:\Users\boni\.cache\selenium\chrome\win64\117.0.5938.22\c
219219
### Implementing Selenium Manager in Your Scripts
220220

221221
{{< tabpane text=true >}}
222-
{{< tab header="Java" >}}
223-
{{< badge-code >}}
222+
{{% tab header="Java" %}}
223+
**Previously**
224+
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/selenium_manager/SeleniumManagerUsageDemo.java#L10-L15" >}}
225+
**Selenium Manager**
226+
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/selenium_manager/SeleniumManagerUsageDemo.java#L18-L22" >}}
224227
{{< /tab >}}
225228
{{% tab header="Python" %}}
226229
**Previously**

website_and_docs/content/documentation/selenium_manager.zh-cn.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,11 @@ INFO Browser path: C:\Users\boni\.cache\selenium\chrome\win64\117.0.5938.22\c
219219
### Implementing Selenium Manager in Your Scripts
220220

221221
{{< tabpane text=true >}}
222-
{{< tab header="Java" >}}
223-
{{< badge-code >}}
222+
{{% tab header="Java" %}}
223+
**Previously**
224+
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/selenium_manager/SeleniumManagerUsageDemo.java#L10-L15" >}}
225+
**Selenium Manager**
226+
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/selenium_manager/SeleniumManagerUsageDemo.java#L18-L22" >}}
224227
{{< /tab >}}
225228
{{% tab header="Python" %}}
226229
**Previously**

website_and_docs/content/documentation/webdriver/browsers/safari.en.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ Property key: `SafariDriverService.SAFARI_DRIVER_LOGGING`\
6969
Property value: `"true"` or `"false"`
7070
{{% /tab %}}
7171
{{< tab header="Python" >}}
72+
{{< badge-version version="4.26" >}}
7273
{{< gh-codeblock path="examples/python/tests/browsers/test_safari.py#L17" >}}
7374
{{< /tab >}}
7475
{{< tab header="CSharp" >}}

0 commit comments

Comments
 (0)