Merge branch 'trunk' into pattern_improvements

Author: pujagani

.bazelignore

@@ -23,5 +23,5 @@ java/build/production
 java/client/build
 java/server/build
 javascript/grid-ui/node_modules
-javascript/node/selenium-webdriver/node_modules
+javascript/selenium-webdriver/node_modules
 node_modules

.github/workflows/nightly.yml

@@ -174,8 +174,8 @@ jobs:
       cache-key: javascript-nightly
       node-version: '22.x'
       run: |
-        sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/node/selenium-webdriver/package.json
-        sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/node/selenium-webdriver/package.json
+        sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/selenium-webdriver/package.json
+        sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/selenium-webdriver/package.json
         echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
         echo "@seleniumhq:registry=https://npm.pkg.github.com" >> ~/.npmrc
         echo "always-auth=true" >> ~/.npmrc

.github/workflows/stage-release.yml

@@ -19,11 +19,13 @@ jobs:
       (github.event.pull_request.merged == true &&
       github.repository_owner == 'seleniumhq' &&
       startsWith(github.event.pull_request.head.ref, 'release-preparation-')) ||
-      (github.event_name == 'workflow_dispatch' && 
-      github.event.inputs.version != '' && 
+      (github.event_name == 'workflow_dispatch' &&
+      github.event.inputs.version != '' &&
       github.repository_owner == 'seleniumhq')
     runs-on: ubuntu-latest
     permissions: write-all
+    outputs:
+      version: ${{ env.VERSION }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -41,10 +43,6 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
-      #      - name: Tag Release
-      #        run: |
-      #          git tag selenium-${{ env.VERSION }} || echo "Tag already exists"
-      #          git push origin selenium-${{ env.VERSION }} || echo "Tag already exists remotely"
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
@@ -71,4 +69,5 @@ jobs:
     needs: github-release
     uses: ./.github/workflows/update-documentation.yml
     with:
-      tag: selenium-${{ needs.github-release.outputs.version }}
+      version: ${{ needs.github-release.outputs.version }}
+      sha: ${{ github.sha }}

.github/workflows/update-documentation.yml

@@ -87,7 +87,7 @@ jobs:
         if: ${{ matrix.language == 'node' }}
         run: |
           npm install
-          npm install --prefix javascript/node/selenium-webdriver
+          npm install --prefix javascript/selenium-webdriver
       - name: Update Documentation
         run: ./go ${{ matrix.language }}:docs
       - name: Documentation Pull Request

.gitignore

@@ -19,11 +19,11 @@ dotnet/packages/
 java/client/src/org/openqa/selenium/ie/IeReturnTypes.java
 java/server/test/org/openqa/selenium/example
 javascript/deps.js
-javascript/node/selenium-webdriver/node_modules/
-javascript/node/selenium-webdriver/lib/atoms/find-elements.js
-javascript/node/selenium-webdriver/lib/atoms/get-attribute.js
-javascript/node/selenium-webdriver/lib/atoms/is-displayed.js
-javascript/node/selenium-webdriver/lib/atoms/mutation-listener.js
+javascript/selenium-webdriver/node_modules/
+javascript/selenium-webdriver/lib/atoms/find-elements.js
+javascript/selenium-webdriver/lib/atoms/get-attribute.js
+javascript/selenium-webdriver/lib/atoms/is-displayed.js
+javascript/selenium-webdriver/lib/atoms/mutation-listener.js
 javascript/safari-driver/node_modules/
 javascript/webdriver/devtools/types/
 .idea/vcs.xml
@@ -137,7 +137,7 @@ MODULE.bazel.lock
 # Engflow
 *.crt
 *.key
-javascript/node/selenium-webdriver/.vscode/settings.json
+javascript/selenium-webdriver/.vscode/settings.json
 
 dotnet-bin
 .metadata/

.skipped-tests

@@ -19,14 +19,14 @@
 -//javascript/atoms:test-edge
 -//javascript/atoms:test-firefox-beta
 -//javascript/chrome-driver/...
--//javascript/node/selenium-webdriver:test-bidi-network-test.js-chrome
--//javascript/node/selenium-webdriver:test-builder-test.js-chrome
--//javascript/node/selenium-webdriver:test-builder-test.js-firefox
--//javascript/node/selenium-webdriver:test-chrome-devtools-test.js-chrome
--//javascript/node/selenium-webdriver:test-chrome-options-test.js-chrome
--//javascript/node/selenium-webdriver:test-chrome-service-test.js-chrome
--//javascript/node/selenium-webdriver:test-firefox-options-test.js-firefox
--//javascript/node/selenium-webdriver:test-lib-capabilities-test.js-chrome
+-//javascript/selenium-webdriver:test-bidi-network-test.js-chrome
+-//javascript/selenium-webdriver:test-builder-test.js-chrome
+-//javascript/selenium-webdriver:test-builder-test.js-firefox
+-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
+-//javascript/selenium-webdriver:test-chrome-options-test.js-chrome
+-//javascript/selenium-webdriver:test-chrome-service-test.js-chrome
+-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
+-//javascript/selenium-webdriver:test-lib-capabilities-test.js-chrome
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/proxy_tests.py

BUILD.bazel

@@ -72,7 +72,7 @@ java_binary(
 
 npm_link_package(
     name = "node_modules/selenium-webdriver",
-    src = "//javascript/node/selenium-webdriver",
+    src = "//javascript/selenium-webdriver",
 )
 
 platform(

CONTRIBUTING.md

@@ -109,7 +109,7 @@ installed on your local machine, or by executing:
 
 ```shell
 # Example of adding a dep to the JS webdriver bindings 
-cd javascript/node/selenium-webdriver
+cd javascript/selenium-webdriver
 bazel run javascript:pnpm -- install my-amazing-dep --dir $PWD
 ```
 
@@ -255,12 +255,12 @@ Build your code for the latest changes and run tests locally.
 
   Node Tests
   ```shell
-  % bazel test //javascript/node/selenium-webdriver:tests
+  % bazel test //javascript/selenium-webdriver:all
   ```
 
   Firefox Atom Tests
   ```shell
-  % bazel test --test_tag_filters=firefox //javascript/atoms/... //javascript/selenium-atoms/... //javascript/webdriver/...
+  % bazel test --test_tag_filters=firefox //javascript/atoms/... //javascript/webdriver/...
   ```
 
   Grid UI Unit Tests

MODULE.bazel

@@ -25,7 +25,7 @@ bazel_dep(name = "rules_oci", version = "1.8.0")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_python", version = "1.1.0")
 bazel_dep(name = "rules_proto", version = "7.0.2")
-bazel_dep(name = "rules_ruby", version = "0.17.2")
+bazel_dep(name = "rules_ruby", version = "0.18.0")
 
 linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
 linter.configure(
@@ -55,7 +55,7 @@ npm.npm_translate_lock(
         "@//:package.json",
         "@//:pnpm-workspace.yaml",
         "@//javascript/grid-ui:package.json",
-        "@//javascript/node/selenium-webdriver:package.json",
+        "@//javascript/selenium-webdriver:package.json",
     ],
     generate_bzl_library_targets = True,
     npmrc = "//:.npmrc",

README.md

@@ -349,13 +349,13 @@ bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest
 To run the tests run:
 
 ```sh
-bazel test //javascript/node/selenium-webdriver:tests
+bazel test //javascript/selenium-webdriver:tests
 ```
 
 You can use `--test_env` to pass in the browser name as `SELENIUM_BROWSER`.
 
 ```sh
-bazel test //javascript/node/selenium-webdriver:tests --test_env=SELENIUM_BROWSER=firefox
+bazel test //javascript/selenium-webdriver:tests --test_env=SELENIUM_BROWSER=firefox
 ```
 
 </details>