Merge branch 'trunk' into petesong/add-practice-example

PeteSong · web-flow · commit 320034281976 · 2024-11-05T15:15:22.000+08:00
diff --git a/.github/workflows/dotnet-examples.yml b/.github/workflows/dotnet-examples.yml
@@ -61,7 +61,9 @@ jobs:
       if: matrix.release == 'nightly' && matrix.os != 'windows'
       run:
         |
-        latest_nightly=$(./scripts/latest-nightly-version.sh nuget Selenium.WebDriver)
+        pip install -r ./scripts/requirements.txt
+        latest_nightly=$(python ./scripts/latest-nightly-version.py nuget Selenium.WebDriver)
+        echo $latest_nightly
         dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly
         dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly
       env:
@@ -71,7 +73,8 @@ jobs:
       shell: pwsh
       run:
         |
-        $latest_nightly = ./scripts/latest-nightly-version.ps1 nuget Selenium.WebDriver
+        pip install -r ./scripts/requirements.txt
+        $latest_nightly = python ./scripts/latest-nightly-version.py nuget Selenium.WebDriver
         dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly
         dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly
       env:
diff --git a/.github/workflows/java-examples.yml b/.github/workflows/java-examples.yml
@@ -48,7 +48,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 17
     - name: Run Tests Stable
       if: matrix.release == 'stable'
       uses: nick-invision/retry@v3.0.0
diff --git a/.github/workflows/js-examples.yml b/.github/workflows/js-examples.yml
@@ -93,7 +93,9 @@ jobs:
       if: matrix.release == 'nightly' && matrix.os != 'windows'
       run:
         |
-        latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver)
+        pip install -r ./scripts/requirements.txt
+        latest_nightly=$(python ./scripts/latest-nightly-version.py npm selenium-webdriver)
+        echo $latest_nightly
         npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -102,7 +104,8 @@ jobs:
       if: matrix.release == 'nightly' && matrix.os == 'windows'
       run:
         |
-        $latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver
+        pip install -r ./scripts/requirements.txt
+        $latest_nightly = python ./scripts/latest-nightly-version.py npm selenium-webdriver
         npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/link-check.yml b/.github/workflows/link-check.yml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Link check
         continue-on-error: true # <- If set to false, run fails with broken links
-        uses: untitaker/hyperlink@0.1.42
+        uses: untitaker/hyperlink@0.1.43
         with:
           args: website_and_docs/public/ --check-anchors
 
diff --git a/.github/workflows/python-examples.yml b/.github/workflows/python-examples.yml
@@ -48,13 +48,24 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: 3.8
-    - name: Install dependencies nightly
-      if: matrix.release == 'nightly'
-      working-directory: ./examples/python
+    - name: Install dependencies nightly non-Windows
+      if: matrix.release == 'nightly' && matrix.os != 'windows'
+      run: |
+        pip install -r ./scripts/requirements.txt
+        latest_nightly_python=$(python ./scripts/latest-python-nightly-version.py)
+        cd examples/python
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install --index-url https://test.pypi.org/simple/ selenium==$latest_nightly_python --extra-index-url https://pypi.org/simple/ --upgrade --force-reinstall --break-system-packages
+    - name: Install dependencies nightly Windows
+      if: matrix.release == 'nightly' && matrix.os == 'windows'
       run: |
+        pip install -r ./scripts/requirements.txt
+        $latest_nightly_python = python ./scripts/latest-python-nightly-version.py
+        cd examples/python
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-        pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple --force-reinstall -v selenium
+        pip install --index-url https://test.pypi.org/simple/ selenium==$latest_nightly_python --extra-index-url https://pypi.org/simple/ --upgrade --force-reinstall --break-system-packages
     - name: Install dependencies stable
       if: matrix.release == 'stable'
       working-directory: ./examples/python
diff --git a/.github/workflows/ruby-examples.yml b/.github/workflows/ruby-examples.yml
@@ -53,7 +53,9 @@ jobs:
         if: matrix.release == 'nightly' && matrix.os != 'windows'
         run:
           |
-          latest_nightly_webdriver=$(./scripts/latest-nightly-version.sh rubygems selenium-webdriver)
+          pip install -r ./scripts/requirements.txt
+          latest_nightly_webdriver=$(python ./scripts/latest-nightly-version.py rubygems selenium-webdriver)
+          echo $latest_nightly_webdriver
           cd examples/ruby
           bundle install
           bundle remove selenium-webdriver
@@ -64,7 +66,8 @@ jobs:
         if: matrix.release == 'nightly' && matrix.os == 'windows'
         run:
           |
-          $latest_nightly_webdriver = ./scripts/latest-nightly-version.ps1 rubygems selenium-webdriver
+          pip install -r ./scripts/requirements.txt
+          $latest_nightly_webdriver = python ./scripts/latest-nightly-version.py rubygems selenium-webdriver
           cd examples/ruby
           bundle install
           bundle remove selenium-webdriver
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This is the repository used to build and publish the official Selenium [website]
 We use [Hugo](https://gohugo.io/) and the [Docsy theme](https://www.docsy.dev/)
 to build and render the site. You will need the **extended**
 Sass/SCSS version of the Hugo binary to work on this site. We recommend
-to use Hugo 0.125.4
+to use **[Hugo 0.125.4](https://github.com/gohugoio/hugo/releases/tag/v0.125.4)**
 
 Steps needed to have this working locally and work on it:
 
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
@@ -55,7 +55,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.2</version>
                 <configuration>
                     <properties>
                         <configurationParameters>
diff --git a/examples/javascript/package-lock.json b/examples/javascript/package-lock.json
diff --git a/examples/javascript/package.json b/examples/javascript/package.json
@@ -11,6 +11,6 @@
         "selenium-webdriver": "4.26.0"
     },
     "devDependencies": {
-        "mocha": "10.7.3"
+        "mocha": "10.8.2"
     }
 }
diff --git a/examples/javascript/test/actionsApi/actionsTest.spec.js b/examples/javascript/test/actionsApi/actionsTest.spec.js
@@ -8,7 +8,7 @@ describe('Actions API - Pause and Release All Actions', function() {
     driver = await new Builder().forBrowser('chrome').build();
   })
 
-  after(() => driver.quit())
+  after(async () => await driver.quit())
 
   it('Pause', async function() {
     await driver.get('https://selenium.dev/selenium/web/mouse_interaction.html')
diff --git a/examples/javascript/test/actionsApi/keysTest.spec.js b/examples/javascript/test/actionsApi/keysTest.spec.js
@@ -9,7 +9,7 @@ describe('Keyboard Action - Keys test', function() {
     driver = await new Builder().forBrowser('chrome').build();
   })
 
-  after(() => driver.quit())
+  after(async () => await driver.quit())
 
   it('KeyDown', async function() {
     await driver.get('https://www.selenium.dev/selenium/web/single_text_input.html')
diff --git a/examples/javascript/test/actionsApi/mouse/clickAndHold.spec.js b/examples/javascript/test/actionsApi/mouse/clickAndHold.spec.js
@@ -7,7 +7,7 @@ describe('Click and hold', function () {
     driver = new Builder().forBrowser('chrome').build();
   });
 
-  after(() => driver.quit());
+  after(async () => await driver.quit());
 
   it('Mouse move and mouseDown on an element', async function () {
     await driver.get('https://www.selenium.dev/selenium/web/mouse_interaction.html');
diff --git a/examples/javascript/test/actionsApi/mouse/clickAndRelease.spec.js b/examples/javascript/test/actionsApi/mouse/clickAndRelease.spec.js
@@ -7,7 +7,7 @@ describe('Click and release', function () {
     driver = new Builder().forBrowser('chrome').build();
   });
 
-  after(() => driver.quit());
+  after(async () => await driver.quit());
 
   it('Mouse move and click on an element', async function () {
     await driver.get('https://www.selenium.dev/selenium/web/mouse_interaction.html');
diff --git a/examples/javascript/test/actionsApi/wheel/scrollByAmount.spec.js b/examples/javascript/test/actionsApi/wheel/scrollByAmount.spec.js
@@ -7,7 +7,7 @@ describe('Scroll by given amount from element', function() {
     driver = await new Builder().forBrowser('chrome').build();
   });
 
-  after(() => driver.quit());
+  after(async() => await driver.quit());
 
   it('Scroll to element by 300', async function() {
     await driver.manage().window().setRect({ width: 500, height: 400 });
diff --git a/examples/javascript/test/actionsApi/wheel/wheelScrollToElement.spec.js b/examples/javascript/test/actionsApi/wheel/wheelScrollToElement.spec.js
@@ -7,7 +7,7 @@ describe('Wheel scroll to element', function() {
     driver = await new Builder().forBrowser('chrome').build();
   });
 
-  after(() => driver.quit());
+  after(async () => await driver.quit());
 
   it('Scroll to the element', async function() {
     // Navigate to the url
diff --git a/examples/javascript/test/elements/fileUpload.spec.js b/examples/javascript/test/elements/fileUpload.spec.js
@@ -13,7 +13,7 @@ describe('File Upload Test', function() {
       .build();
   });
 
-  after(() => driver.quit());
+  after(async() => await driver.quit());
 
   it('Should be able to upload a file successfully', async function() {
     const image = path.resolve('./test/resources/selenium-snapshot.png')
diff --git a/examples/javascript/test/virtual_authenticator/virtualAuthenticator.spec.js b/examples/javascript/test/virtual_authenticator/virtualAuthenticator.spec.js
@@ -39,7 +39,7 @@ describe('Virtual authenticator', function() {
     driver = await new Builder().forBrowser('chrome').build();
   });
 
-  after(() => driver.quit());
+  after(async() => await driver.quit());
 
   function arraysEqual(array1, array2) {
     return (array1.length === array2.length &&
@@ -187,7 +187,7 @@ describe('Virtual authenticator', function() {
       0);
 
     await driver.addCredential(nonResidentCredential);
-    driver.removeAllCredentials();
+    await driver.removeAllCredentials();
 
     let credentialList = await driver.getCredentials();
     assert.equal(0, credentialList.length);
diff --git a/examples/kotlin/pom.xml b/examples/kotlin/pom.xml
@@ -17,7 +17,7 @@
         <junit5.version>5.11.3</junit5.version>
         <wdm.version>5.2.3</wdm.version>
 
-        <maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
 
         <java.version>1.8</java.version>
         <selenium.version>4.26.0</selenium.version>
diff --git a/examples/ruby/Gemfile.lock b/examples/ruby/Gemfile.lock
@@ -41,7 +41,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.33.0)
       parser (>= 3.3.1.0)
-    rubocop-rspec (3.1.0)
+    rubocop-rspec (3.2.0)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
diff --git a/scripts/latest-nightly-version.ps1 b/scripts/latest-nightly-version.ps1
diff --git a/scripts/latest-nightly-version.py b/scripts/latest-nightly-version.py
@@ -0,0 +1,31 @@
+import subprocess
+import json
+import argparse
+
+def get_latest_nightly_version(package_type, package_name):
+    path_packages_api = f"orgs/seleniumhq/packages/{package_type}/{package_name}/versions"
+    accept_header = "Accept: application/vnd.github+json"
+    version_header = "X-GitHub-Api-Version: 2022-11-28"
+
+    gh_api_command = [
+        "gh", "api", "-H", accept_header, "-H", version_header, path_packages_api
+    ]
+
+    result = subprocess.run(gh_api_command, capture_output=True, text=True)
+    if result.returncode != 0:
+        raise Exception(f"Error executing gh api command: {result.stderr}")
+
+    versions = json.loads(result.stdout)
+    latest_version = versions[0]['name']
+    return latest_version
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Get the latest nightly version of a package.')
+    parser.add_argument('package_type', type=str, help='The type of the package')
+    parser.add_argument('package_name', type=str, help='The name of the package')
+
+    args = parser.parse_args()
+    package_type = args.package_type
+    package_name = args.package_name
+
+    print(get_latest_nightly_version(package_type, package_name))
diff --git a/scripts/latest-nightly-version.sh b/scripts/latest-nightly-version.sh
diff --git a/scripts/latest-python-nightly-version.py b/scripts/latest-python-nightly-version.py
@@ -0,0 +1,12 @@
+import requests
+import json
+import re
+
+response = requests.get("https://test.pypi.org/pypi/selenium/json")
+data = response.json()
+
+versions = data['releases'].keys()
+sorted_versions = sorted(versions, key=lambda s: [int(part) if part.isdigit() else part for part in re.split(r'(\d+)', s)])
+latest_version = sorted_versions[-1]
+
+print(latest_version)
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
@@ -0,0 +1 @@
+requests
diff --git a/website_and_docs/content/documentation/webdriver/browsers/safari.en.md b/website_and_docs/content/documentation/webdriver/browsers/safari.en.md
@@ -96,7 +96,7 @@ Apple provides a development version of their browser — [Safari Technology Pre
 {{< badge-code >}}
 {{< /tab >}}
 {{% tab header="Python" %}}
-{{< badge-code >}}
+{{< gh-codeblock path="examples/python/tests/browsers/test_safari.py#L25-L30" >}}
 {{% /tab %}}
 {{< tab header="CSharp" >}}
 {{< badge-code >}}
diff --git a/website_and_docs/content/documentation/webdriver/browsers/safari.ja.md b/website_and_docs/content/documentation/webdriver/browsers/safari.ja.md
@@ -96,7 +96,7 @@ To use this version in your code:
 {{< badge-code >}}
 {{< /tab >}}
 {{% tab header="Python" %}}
-{{< badge-code >}}
+{{< gh-codeblock path="examples/python/tests/browsers/test_safari.py#L25-L30" >}}
 {{% /tab %}}
 {{< tab header="CSharp" >}}
 {{< badge-code >}}
diff --git a/website_and_docs/content/documentation/webdriver/browsers/safari.pt-br.md b/website_and_docs/content/documentation/webdriver/browsers/safari.pt-br.md
@@ -96,7 +96,7 @@ To use this version in your code:
 {{< badge-code >}}
 {{< /tab >}}
 {{% tab header="Python" %}}
-{{< badge-code >}}
+{{< gh-codeblock path="examples/python/tests/browsers/test_safari.py#L25-L30" >}}
 {{% /tab %}}
 {{< tab header="CSharp" >}}
 {{< badge-code >}}
diff --git a/website_and_docs/content/documentation/webdriver/browsers/safari.zh-cn.md b/website_and_docs/content/documentation/webdriver/browsers/safari.zh-cn.md
@@ -100,7 +100,7 @@ Apple 提供了其浏览器的开发版本 — [Safari Technology Preview](https
 {{< badge-code >}}
 {{< /tab >}}
 {{% tab header="Python" %}}
-{{< badge-code >}}
+{{< gh-codeblock path="examples/python/tests/browsers/test_safari.py#L25-L30" >}}
 {{% /tab %}}
 {{< tab header="CSharp" >}}
 {{< badge-code >}}
diff --git a/website_and_docs/content/documentation/webdriver/drivers/_index.en.md b/website_and_docs/content/documentation/webdriver/drivers/_index.en.md
diff --git a/website_and_docs/content/documentation/webdriver/drivers/_index.ja.md b/website_and_docs/content/documentation/webdriver/drivers/_index.ja.md
diff --git a/website_and_docs/content/documentation/webdriver/drivers/_index.pt-br.md b/website_and_docs/content/documentation/webdriver/drivers/_index.pt-br.md
diff --git a/website_and_docs/content/documentation/webdriver/drivers/_index.zh-cn.md b/website_and_docs/content/documentation/webdriver/drivers/_index.zh-cn.md
diff --git a/website_and_docs/content/documentation/webdriver/drivers/remote_webdriver.en.md b/website_and_docs/content/documentation/webdriver/drivers/remote_webdriver.en.md
diff --git a/website_and_docs/content/documentation/webdriver/drivers/remote_webdriver.ja.md b/website_and_docs/content/documentation/webdriver/drivers/remote_webdriver.ja.md
diff --git a/website_and_docs/content/documentation/webdriver/drivers/remote_webdriver.zh-cn.md b/website_and_docs/content/documentation/webdriver/drivers/remote_webdriver.zh-cn.md
diff --git a/website_and_docs/layouts/partials/selenium-clients-and-webdriver-bindings.html b/website_and_docs/layouts/partials/selenium-clients-and-webdriver-bindings.html

-Original file line number
+Diff line change
       - name: Link check
         continue-on-error: true # <- If set to false, run fails with broken links
 -        uses: untitaker/[email protected].42
 +        uses: untitaker/[email protected].43
         with:
           args: website_and_docs/public/ --check-anchors
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`	`"selenium-webdriver": "4.26.0"`
`12`	`12`	`},`
`13`	`13`	`"devDependencies": {`
`14`		`- "mocha": "10.7.3"`
	`14`	`+ "mocha": "10.8.2"`
`15`	`15`	`}`
`16`	`16`	`}`