Skip to content

Commit 58b28bd

Browse files
yvsvarmayvsvarma
authored
Merge branch 'trunk' into add-safari-logging-example-js
2 parents 1d3ffc6 + 1a80c1e commit 58b28bd

File tree

18 files changed

+94
-23
lines changed

18 files changed

+94
-23
lines changed

‎examples/java/src/test/java/dev/selenium/selenium_manager/SeleniumManagerUsageDemo.java

+24
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/python/tests/browsers/test_safari.py

+1-1
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

+2-2
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/")

‎website_and_docs/content/documentation/selenium_manager.en.md

+5-2
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

+5-2
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

+5-2
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

+5-2
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

+1
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" >}}

‎website_and_docs/content/documentation/webdriver/browsers/safari.ja.md

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Property key: `SafariDriverService.SAFARI_DRIVER_LOGGING`\
6868
Property value: `"true"` or `"false"`
6969
{{% /tab %}}
7070
{{< tab header="Python" >}}
71+
{{< badge-version version="4.26" >}}
7172
{{< gh-codeblock path="examples/python/tests/browsers/test_safari.py#L17" >}}
7273
{{< /tab >}}
7374
{{< tab header="CSharp" >}}

‎website_and_docs/content/documentation/webdriver/browsers/safari.pt-br.md

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Property key: `SafariDriverService.SAFARI_DRIVER_LOGGING`\
6868
Property value: `"true"` or `"false"`
6969
{{% /tab %}}
7070
{{< tab header="Python" >}}
71+
{{< badge-version version="4.26" >}}
7172
{{< gh-codeblock path="examples/python/tests/browsers/test_safari.py#L17" >}}
7273
{{< /tab >}}
7374
{{< tab header="CSharp" >}}

‎website_and_docs/content/documentation/webdriver/browsers/safari.zh-cn.md

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ Safari 浏览器不允许您选择日志的输出位置或更改级别.
7171
属性值: `"true"` 或 `"false"`
7272
{{% /tab %}}
7373
{{< tab header="Python" >}}
74+
{{< badge-version version="4.26" >}}
7475
{{< gh-codeblock path="examples/python/tests/browsers/test_safari.py#L17" >}}
7576
{{< /tab >}}
7677
{{< tab header="CSharp" >}}

‎website_and_docs/content/documentation/webdriver/interactions/print_page.en.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Using the `getPageRanges()` and `setPageRanges()` methods, you can get/set the r
6464
{{< /tabpane >}}
6565

6666
### Size
67-
Using the `getPaperSize()` and `setPaperSize()` methods, you can get/set the paper size to print --- e.g. "A0", "A6", "Legal", "Tabloid", etc.
67+
Using the `getPageSize()` and `setPageSize()` methods, you can get/set the paper size to print --- e.g. "A0", "A6", "Legal", "Tabloid", etc.
6868

6969
{{< tabpane text=true >}}
7070
{{< tab header="Java" >}}

‎website_and_docs/content/documentation/webdriver/interactions/print_page.ja.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Using the `getPageRanges()` and `setPageRanges()` methods, you can get/set the r
6464
{{< /tabpane >}}
6565

6666
### Size
67-
Using the `getPaperSize()` and `setPaperSize()` methods, you can get/set the paper size to print --- e.g. "A0", "A6", "Legal", "Tabloid", etc.
67+
Using the `getPageSize()` and `setPageSize()` methods, you can get/set the paper size to print --- e.g. "A0", "A6", "Legal", "Tabloid", etc.
6868

6969
{{< tabpane text=true >}}
7070
{{< tab header="Java" >}}

‎website_and_docs/content/documentation/webdriver/interactions/print_page.pt-br.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Using the `getPageRanges()` and `setPageRanges()` methods, you can get/set the r
6464
{{< /tabpane >}}
6565

6666
### Size
67-
Using the `getPaperSize()` and `setPaperSize()` methods, you can get/set the paper size to print --- e.g. "A0", "A6", "Legal", "Tabloid", etc.
67+
Using the `getPageSize()` and `setPageSize()` methods, you can get/set the paper size to print --- e.g. "A0", "A6", "Legal", "Tabloid", etc.
6868

6969
{{< tabpane text=true >}}
7070
{{< tab header="Java" >}}

‎website_and_docs/content/documentation/webdriver/interactions/print_page.zh-cn.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Selenium 通过其 PrintOptions、PrintsPage 和 browsingContext 类简化了这
6262
{{< /tabpane >}}
6363

6464
### 尺寸
65-
通过 `getPaperSize()` 和 `setPaperSize()` 方法，可以获取/设置要打印页面的纸张尺寸（如"A0"、"A6"、"Legal"、"Tabloid" 等）。
65+
通过 `getPageSize()` 和 `setPageSize()` 方法，可以获取/设置要打印页面的纸张尺寸（如"A0"、"A6"、"Legal"、"Tabloid" 等）。
6666

6767
{{< tabpane text=true >}}
6868
{{< tab header="Java" >}}

‎website_and_docs/content/events/_index.html

+6-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,12 @@ <h2 class="card-title">Selenium Meetups</h2>
4545
<div class="card-body">
4646
<h2 class="card-title">Selenium Conference</h2>
4747
<p class="card-text pt-4">
48-
The next flagship Selenium conference will be an in-person event held in Chicago, IL on March 28-30, 2023 The SeConf brings
49-
together Selenium developers & enthusiasts from around the world to share ideas,
50-
socialize, and work together on advancing the present and future success of the project.
48+
The next flagship Selenium conference will be held together
49+
with Appium conference. It will be an in-person event
50+
held in Valencia, Spain on March 26-28, 2025. The Selenium Conference
51+
and Appium Conference brings together Selenium and Appium developers & enthusiasts
52+
from around the world to share ideas, socialize, and work together on
53+
advancing the present and future success of the project.
5154
</p>
5255
</div>
5356
<div class="card-footer bg-transparent border-0">

‎website_and_docs/hugo.toml

+29-5
Original file line numberDiff line numberDiff line change
@@ -206,16 +206,40 @@ enable = false
206206

207207
[params.links]
208208
# End user relevant links. These will show up on left side of footer and in the community page if you have one.
209+
[[params.links.user]]
210+
name = "Selenium Linkedin"
211+
url = "https://www.linkedin.com/company/4826427/"
212+
icon = "fab fa-linkedin-in"
213+
desc = "Check all the Community talks!"
214+
# Developer relevant links. These will show up on right side of footer and in the community page if you have one.
215+
[[params.links.user]]
216+
name ="Selenium X"
217+
url = "https://x.com/SeleniumHQ"
218+
icon = "fab fa-twitter"
219+
desc = "Follow us on X to get the latest news!"
220+
[[params.links.user]]
221+
name = "Selenium Community YouTube Channel"
222+
url = "https://www.youtube.com/@SeleniumHQProject/streams"
223+
icon = "fab fa-youtube"
224+
desc = "Check all the Community talks!"
225+
# Developer relevant links. These will show up on right side of footer and in the community page if you have one.
226+
[[params.links.user]]
227+
name = "Selenium Mastodon"
228+
url = "https://mastodon.social/@[email protected]"
229+
icon = "fab fa-mastodon"
230+
desc = "Selenium mastodon!"
231+
# Developer relevant links. These will show up on right side of footer and in the community page if you have one.
232+
[[params.links.user]]
233+
name = "Selenium BlueSky"
234+
url = "https://bsky.app/profile/seleniumconf.bsky.social"
235+
icon = "fab fa-bluesky"
236+
desc = "Selenium BlueSky!"
237+
# Developer relevant links. These will show up on right side of footer and in the community page if you have one.
209238
[[params.links.user]]
210239
name = "User mailing list"
211240
url = "https://groups.google.com/group/selenium-users"
212241
icon = "fas fa-mail-bulk"
213242
desc = "Discussion and help from your fellow users"
214-
[[params.links.user]]
215-
name ="Selenium in Twitter"
216-
url = "https://twitter.com/SeleniumHQ"
217-
icon = "fab fa-twitter"
218-
desc = "Follow us on Twitter to get the latest news!"
219243
[[params.links.user]]
220244
name = "SeleniumConf YouTube Channel"
221245
url = "https://www.youtube.com/channel/UCbDlgX_613xNMrDqCe3QNEw"

‎website_and_docs/layouts/partials/announcement-banner.html

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ <h4 class="alert-heading text-center m-2">
99
Registrations Open for SeleniumConf 2025 | March 26–28 | Join Us In-Person!
1010
<a href="https://seleniumconf.com/?utm_medium=Referral&utm_source=selenium.dev&utm_campaign=register" target='_blank' aria-pressed="true"> Register now!</a>
1111
</h4>
12+
<h4 class="alert-heading text-center m-4">
13+
Join us for Selenium Community Live Episode 2 on Jan 21st, 2025 -
14+
<a href="https://www.linkedin.com/events/seleniumcommunitylive-episode27278315412075769856/" target='_blank' aria-pressed="true"> More information here</a>
15+
</h4>
1216
</div>
1317
</div>
1418
</div>

0 commit comments

Comments
 (0)