diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 118d98bf20b3..efa042dca131 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,7 @@ jobs: with: fetch-depth: 0 - name: Setup Hugo - uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f + uses: peaceiris/actions-hugo@v3 with: hugo-version: ' 0.125.4' extended: true diff --git a/.github/workflows/link-check.yml b/.github/workflows/link-check.yml index 40c59ab7ca80..d3d624d7b211 100644 --- a/.github/workflows/link-check.yml +++ b/.github/workflows/link-check.yml @@ -19,9 +19,9 @@ jobs: uses: actions/checkout@v4 - name: Set up Hugo - uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f + uses: peaceiris/actions-hugo@v3 with: - hugo-version: "0.110.0" + hugo-version: ' 0.125.4' extended: true - name: Setup Node @@ -51,4 +51,4 @@ jobs: with: name: hyperlink-report path: website_and_docs/tmp/.hyperlink/hyperlink.log - retention-days: 7 # default is 90 days \ No newline at end of file + retention-days: 7 # default is 90 days diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7033d60d726d..1a652b17634d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: - name: Checkout repo uses: actions/checkout@v4 - name: Setup Hugo - uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f + uses: peaceiris/actions-hugo@v3 with: hugo-version: '0.125.4' extended: true diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 9e35fe3acb1f..3bbe3fbf76cc 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -10,7 +10,7 @@ repositories { } dependencies { - testImplementation 'org.seleniumhq.selenium:selenium-java:4.20.0' + testImplementation 'org.seleniumhq.selenium:selenium-java:4.21.0' testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.2' } diff --git a/examples/java/pom.xml b/examples/java/pom.xml index a494040ffec9..a1c6c701bf25 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -13,7 +13,7 @@ 11 11 UTF-8 - 4.20.0 + 4.21.0 diff --git a/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LocateNodesTest.java b/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LocateNodesTest.java index 22c7f0f8ee5c..af0003daacbf 100644 --- a/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LocateNodesTest.java +++ b/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/LocateNodesTest.java @@ -47,7 +47,7 @@ void canLocateNodes() { BrowsingContext browsingContext = new BrowsingContext(driver, driver.getWindowHandle()); driver.get("https://www.selenium.dev/selenium/web/xhtmlTest.html"); - LocateNodeParameters parameters = new LocateNodeParameters.Builder(Locator.css("div")).build(); + LocateNodeParameters parameters = new LocateNodeParameters(Locator.css("div")); List elements = browsingContext.locateNodes(parameters); Assertions.assertEquals(13, elements.size()); @@ -81,9 +81,8 @@ void canLocateNodesWithCSSLocator() { driver.get("https://www.selenium.dev/selenium/web/xhtmlTest.html"); LocateNodeParameters parameters = - new LocateNodeParameters.Builder(Locator.css("div.extraDiv, div.content")) - .setMaxNodeCount(1) - .build(); + new LocateNodeParameters(Locator.css("div.extraDiv, div.content")) + .setMaxNodeCount(1); List elements = browsingContext.locateNodes(parameters); @@ -101,9 +100,7 @@ void canLocateNodesWithXPathLocator() { driver.get("https://www.selenium.dev/selenium/web/xhtmlTest.html"); LocateNodeParameters parameters = - new LocateNodeParameters.Builder(Locator.xpath("/html/body/div[2]")) - .setMaxNodeCount(1) - .build(); + new LocateNodeParameters(Locator.xpath("/html/body/div[2]")).setMaxNodeCount(1); List elements = browsingContext.locateNodes(parameters); @@ -121,9 +118,7 @@ void canLocateNodesWithInnerText() { driver.get("https://www.selenium.dev/selenium/web/xhtmlTest.html"); LocateNodeParameters parameters = - new LocateNodeParameters.Builder(Locator.innerText("Spaced out")) - .setMaxNodeCount(1) - .build(); + new LocateNodeParameters(Locator.innerText("Spaced out")).setMaxNodeCount(1); List elements = browsingContext.locateNodes(parameters); @@ -139,44 +134,12 @@ void canLocateNodesWithMaxNodeCount() { driver.get("https://www.selenium.dev/selenium/web/xhtmlTest.html"); LocateNodeParameters parameters = - new LocateNodeParameters.Builder(Locator.css("div")).setMaxNodeCount(4).build(); + new LocateNodeParameters(Locator.css("div")).setMaxNodeCount(4); List elements = browsingContext.locateNodes(parameters); Assertions.assertEquals(4, elements.size()); } - @Test - @Disabled - void canLocateNodesWithNoneOwnershipParameter() { - BrowsingContext browsingContext = new BrowsingContext(driver, driver.getWindowHandle()); - - driver.get("https://www.selenium.dev/selenium/web/xhtmlTest.html"); - - LocateNodeParameters parameters = - new LocateNodeParameters.Builder(Locator.css("div")) - .setOwnership(ResultOwnership.NONE) - .build(); - - List elements = browsingContext.locateNodes(parameters); - Assertions.assertFalse(elements.get(0).getHandle().isPresent()); - } - - @Test - @Disabled - void canLocateNodesWithRootOwnershipParameter() { - BrowsingContext browsingContext = new BrowsingContext(driver, driver.getWindowHandle()); - - driver.get("https://www.selenium.dev/selenium/web/xhtmlTest.html"); - - LocateNodeParameters parameters = - new LocateNodeParameters.Builder(Locator.css("div")) - .setOwnership(ResultOwnership.ROOT) - .build(); - - List elements = browsingContext.locateNodes(parameters); - Assertions.assertTrue(elements.get(0).getHandle().isPresent()); - } - @Test @Disabled void canLocateNodesGivenStartNodes() { @@ -205,10 +168,9 @@ void canLocateNodesGivenStartNodes() { new RemoteReference(RemoteReference.Type.SHARED_ID, value.getSharedId().get()))); LocateNodeParameters parameters = - new LocateNodeParameters.Builder(Locator.css("input")) + new LocateNodeParameters(Locator.css("input")) .setStartNodes(startNodes) - .setMaxNodeCount(50) - .build(); + .setMaxNodeCount(50); List elements = browsingContext.locateNodes(parameters); Assertions.assertEquals(35, elements.size()); @@ -223,10 +185,9 @@ void canLocateNodesInAGivenSandbox() { browsingContext.navigate("https://www.selenium.dev/selenium/web/xhtmlTest.html", ReadinessState.COMPLETE); LocateNodeParameters parameters = - new LocateNodeParameters.Builder(Locator.css("div")) + new LocateNodeParameters(Locator.css("div")) .setSandbox(sandbox) - .setMaxNodeCount(1) - .build(); + .setMaxNodeCount(1); List elements = browsingContext.locateNodes(parameters); diff --git a/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java b/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java index d02e77115b7f..7346049cfd9e 100644 --- a/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java +++ b/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java @@ -11,6 +11,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import org.openqa.selenium.bidi.module.Script; import org.openqa.selenium.bidi.browsingcontext.BrowsingContext; import org.openqa.selenium.bidi.script.LocalValue; @@ -28,7 +30,7 @@ public void setup() { options.setCapability("webSocketUrl", true); driver = new FirefoxDriver(options); } - + @Test void canListenToChannelMessage() throws ExecutionException, InterruptedException, TimeoutException { @@ -50,6 +52,7 @@ void canListenToChannelMessage() } @Test + @DisabledOnOs(value = OS.MAC, disabledReason = "Works locally, times out on CI") void canListenToRealmCreatedEvent() throws ExecutionException, InterruptedException, TimeoutException { try (Script script = new Script(driver)) { diff --git a/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.en.md b/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.en.md index 21d75046980e..f49919513e7f 100644 --- a/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.en.md +++ b/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.en.md @@ -284,7 +284,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L52-L75" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L37-L51" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -303,7 +303,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L55-L62" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L58-L68" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -322,7 +322,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L72-L79" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L75-L85" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} diff --git a/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.ja.md b/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.ja.md index a5a1be19e013..6e599f05818c 100644 --- a/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.ja.md +++ b/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.ja.md @@ -294,7 +294,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L52-L75" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L37-L51" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -313,7 +313,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L55-L62" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L58-L68" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -332,7 +332,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L72-L79" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L75-L85" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} diff --git a/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.pt-br.md b/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.pt-br.md index 412fc8a80b92..8d2aa29c98d5 100644 --- a/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.pt-br.md +++ b/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.pt-br.md @@ -294,7 +294,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L52-L75" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L37-L51" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -313,7 +313,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L55-L62" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L58-L68" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -332,7 +332,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L72-L79" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L75-L85" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -344,4 +344,4 @@ This section contains the APIs related to script events. {{< tab header="Kotlin" >}} {{< badge-code >}} {{< /tab >}} -{{< /tabpane >}} \ No newline at end of file +{{< /tabpane >}} diff --git a/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.zh-cn.md b/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.zh-cn.md index 8d078a498c60..82dfefda80d8 100644 --- a/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.zh-cn.md +++ b/website_and_docs/content/documentation/webdriver/bidirectional/webdriver_bidi/script.zh-cn.md @@ -294,7 +294,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L52-L75" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L37-L51" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -313,7 +313,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L55-L62" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L58-L68" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -332,7 +332,7 @@ This section contains the APIs related to script events. {{< tabpane text=true >}} {{< tab header="Java" >}} {{< badge-version version="4.16" >}} -{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L72-L79" >}} +{{< gh-codeblock path="/examples/java/src/test/java/dev/selenium/bidirectional/webdriver_bidi/ScriptEventsTest.java#L75-L85" >}} {{< /tab >}} {{< tab header="Ruby" >}} {{< badge-code >}} @@ -344,4 +344,4 @@ This section contains the APIs related to script events. {{< tab header="Kotlin" >}} {{< badge-code >}} {{< /tab >}} -{{< /tabpane >}} \ No newline at end of file +{{< /tabpane >}}