Merge branch 'trunk' into js_ws_port

Author: harsha509

.github/workflows/bazel.yml

@@ -139,6 +139,9 @@ jobs:
         uses: bazel-contrib/[email protected]
         with:
           bazelrc: common --color=yes
+      - name: Setup curl for Ubuntu
+        if: inputs.os == 'ubuntu'
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Setup Fluxbox and Xvfb
         if: inputs.os == 'ubuntu' && inputs.browser != ''
         run: |
@@ -152,9 +155,6 @@ jobs:
       - name: Setup Safari
         if: inputs.browser == 'safari'
         run: sudo safaridriver --enable
-      - name: Setup curl for Ubuntu
-        if: inputs.os == 'ubuntu'
-        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Run Bazel
         run: ${{ inputs.run }}
       - name: Start SSH session

Rakefile

@@ -509,19 +509,21 @@ namespace :node do
   task deploy: :release
 
   desc 'Generate Node documentation'
-  task :docs, [:skip_update] do |_task, arguments|
+  task :docs do |_task, arguments|
     abort('Aborting documentation update: nightly versions should not update docs.') if node_version.include?('nightly')
 
     puts 'Generating Node documentation'
     FileUtils.rm_rf('build/docs/api/javascript/')
     begin
-      sh 'npm install --prefix javascript/selenium-webdriver', verbose: true
-      sh 'npm run generate-docs --prefix javascript/selenium-webdriver', verbose: true
+      Dir.chdir('javascript/selenium-webdriver') do
+        sh 'pnpm install', verbose: true
+        sh 'pnpm run generate-docs', verbose: true
+      end
     rescue StandardError => e
       puts "Node documentation generation contains errors; continuing... #{e.message}"
     end
 
-    update_gh_pages unless arguments[:skip_update]
+    update_gh_pages unless arguments.to_a.include?('skip_update')
   end
 
   desc 'Update JavaScript changelog'
@@ -544,9 +546,7 @@ namespace :node do
     end
 
     # Update package-lock.json
-    Dir.chdir('javascript/selenium-webdriver') do
-      sh 'npm install --prefix javascript/selenium-webdriver', verbose: true
-    end
+    sh 'pnpm install --dir javascript/selenium-webdriver', verbose: true
     @git.add('javascript/selenium-webdriver/package-lock.json')
   end
 end
@@ -611,7 +611,7 @@ namespace :py do
   end
 
   desc 'Generate Python documentation'
-  task :docs, [:skip_update] do |_task, arguments|
+  task :docs do |_task, arguments|
     if python_version.match?(/^\d+\.\d+\.\d+\.\d+$/)
       abort('Aborting documentation update: nightly versions should not update docs.')
     end
@@ -626,7 +626,7 @@ namespace :py do
       raise
     end
 
-    update_gh_pages unless arguments[:skip_update]
+    update_gh_pages unless arguments.to_a.include?('skip_update')
   end
 
   desc 'Install Python wheel locally'
@@ -779,7 +779,7 @@ namespace :rb do
   end
 
   desc 'Generate Ruby documentation'
-  task :docs, [:skip_update] do |_task, arguments|
+  task :docs do |_task, arguments|
     abort('Aborting documentation update: nightly versions should not update docs.') if ruby_version.include?('nightly')
     puts 'Generating Ruby documentation'
 
@@ -788,7 +788,7 @@ namespace :rb do
     FileUtils.mkdir_p('build/docs/api')
     FileUtils.cp_r('bazel-bin/rb/docs.sh.runfiles/_main/docs/api/rb/.', 'build/docs/api/rb')
 
-    update_gh_pages unless arguments[:skip_update]
+    update_gh_pages unless arguments.to_a.include?('skip_update')
   end
 
   desc 'Update Ruby changelog'
@@ -875,7 +875,7 @@ namespace :dotnet do
   end
 
   desc 'Generate .NET documentation'
-  task :docs, [:skip_update] do |_task, arguments|
+  task :docs do |_task, arguments|
     if dotnet_version.include?('nightly')
       abort('Aborting documentation update: nightly versions should not update docs.')
     end
@@ -905,7 +905,7 @@ namespace :dotnet do
       end
     end
 
-    update_gh_pages unless arguments[:skip_update]
+    update_gh_pages unless arguments.to_a.include?('skip_update')
   end
 
   desc 'Update .NET changelog'
@@ -990,15 +990,15 @@ namespace :java do
   task install: :'maven-install'
 
   desc 'Generate Java documentation'
-  task :docs, [:skip_update] do |_task, arguments|
+  task :docs do |_task, arguments|
     if java_version.include?('SNAPSHOT')
       abort('Aborting documentation update: snapshot versions should not update docs.')
     end
 
     puts 'Generating Java documentation'
     Rake::Task['javadocs'].invoke
 
-    update_gh_pages unless arguments[:skip_update]
+    update_gh_pages unless arguments.to_a.include?('skip_update')
   end
 
   desc 'Update Maven dependencies'
@@ -1248,8 +1248,8 @@ def update_gh_pages(force: true)
   @git.fetch('https://github.com/seleniumhq/selenium.git', {ref: 'gh-pages'})
 
   unless force
-    puts 'Stashing current changes before checkout...'
-    Git::Stash.new(@git, 'stash wip')
+    puts 'Stash changes that are not docs...'
+    @git.lib.send(:command, 'stash', ['push', '-m', 'stash wip', '--', ':(exclude)build/docs/api/'])
   end
 
   @git.checkout('gh-pages', force: force)

dotnet/test/common/BiDi/Browser/BrowserTest.cs

@@ -61,8 +61,6 @@ public async Task CanRemoveUserContext()
     }
 
     [Test]
-    [IgnoreBrowser(Selenium.Browser.Chrome, "BiDi GetClientWindows command not yet supported by Chrome 133")]
-    [IgnoreBrowser(Selenium.Browser.Edge, "BiDi GetClientWindows command not yet supported by Edge 133")]
     public async Task CanGetClientWindows()
     {
         var clientWindows = await bidi.Browser.GetClientWindowsAsync();

dotnet/test/common/BiDi/Storage/StorageTest.cs

@@ -76,6 +76,7 @@ public async Task CanAddCookie()
     }
 
     [Test]
+    [IgnoreBrowser(Selenium.Browser.Edge, "GetCookiesAsync returns incorrect cookies: https://github.com/MicrosoftEdge/EdgeWebDriver/issues/194")]
     public async Task CanAddAndGetCookie()
     {
         driver.Url = UrlBuilder.WhereIs("animals");
@@ -109,6 +110,7 @@ await context.Storage.SetCookieAsync(new("fish", "cod", UrlBuilder.HostName)
     }
 
     [Test]
+    [IgnoreBrowser(Selenium.Browser.Edge, "GetCookiesAsync returns incorrect cookies: https://github.com/MicrosoftEdge/EdgeWebDriver/issues/194")]
     public async Task CanGetAllCookies()
     {
         driver.Url = UrlBuilder.WhereIs("animals");
@@ -143,6 +145,7 @@ public async Task CanDeleteAllCookies()
     }
 
     [Test]
+    [IgnoreBrowser(Selenium.Browser.Edge, "GetCookiesAsync returns incorrect cookies: https://github.com/MicrosoftEdge/EdgeWebDriver/issues/194")]
     public async Task CanDeleteCookieWithName()
     {
         driver.Url = UrlBuilder.WhereIs("animals");

javascript/selenium-webdriver/jsdoc_conf.json

@@ -8,7 +8,7 @@
   "opts": {
     "encoding": "utf8",
     "readme": "./README.md",
-    "destination": "../../../build/docs/api/javascript/",
+    "destination": "../../build/docs/api/javascript/",
     "recurse": true,
     "verbose": true,
     "template": "./node_modules/clean-jsdoc-theme",

rust/tests/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@crates//:defs.bzl", "all_crate_deps")
-load("//rust:defs.bzl", "rust_library", "rust_test_suite", "rustfmt_config")
+load("//rust:defs.bzl", "rust_test_suite", "rustfmt_config")
 
 rustfmt_config(
     name = "enable-rustfmt",