Merge branch 'trunk' into rb_add_support_for_chrome_beta

Author: aguspe

.github/label-commenter-config.yml

@@ -1,6 +1,6 @@
 # Configuration for Label Commenter - https://github.com/peaceiris/actions-label-commenter
 labels:
-  - name: needs-triaging
+  - name: A-needs-triaging
     labeled:
       issue:
         body: |
@@ -15,7 +15,7 @@ labels:
                 Triage this issue by using labels.
               </p>
               <p>
-                If information is missing, add a helpful comment and then <code>I-issue-template</code> label.
+                If information is missing, add a helpful comment and then <code>J-issue-template</code> label.
               </p>
               <p>
                 If the issue is a question, add the <code>I-question</code> label.
@@ -101,18 +101,18 @@ labels:
 
           Feel free to comment the issues that you raise back in this issue. Thank you.
         action: close
-  - name: I-issue-template
+  - name: J-issue-template
     labeled:
       issue:
         body: |
           Hi, @{{ issue.user.login }}.
-          Please follow the issue template, we need more information to reproduce the issue.
+          Please follow the issue template; we need more information to reproduce the issue.
 
           Either a complete code snippet and URL/HTML (if more than one file is needed, provide a GitHub repo and instructions to run the code), the specific versions used, or a more detailed description to help us understand the issue.
 
           Note: If you cannot share your code and URL/HTML, any complete code snippet and URL/HTML that reproduces the issue is good enough.
 
-          Reply to this issue when all information is provided, thank you.
+          Reply to this issue when all information is provided. Thank you.
   - name: I-question
     labeled:
       issue:
@@ -137,3 +137,17 @@ labels:
 
           Please turn on logging and re-run your code. Information on how to adjust logs for your language can be found in our
           [Troubleshooting documentation](https://www.selenium.dev/documentation/webdriver/troubleshooting/logging/).
+  - name: B-support
+    labeled:
+      issue:
+        body: |
+          Hi, @{{ issue.user.login }}.
+
+          This is related to code in the Support packages. The support packages contain example code that
+          many users find helpful, but they do not necessarily represent the best practices for using Selenium,
+          and the Selenium team is not prioritizing work on them right now.
+          This doesn't mean that we won't ever work on them, but it is not on our roadmap as we push to release Selenium 5.
+
+          We actively encourage people to create their own wrapper and helper code that makes sense for them.
+          If you have any questions, please [contact us](https://www.selenium.dev/support)
+

.github/renovate.json

@@ -0,0 +1,3 @@
+{
+  "labels": ["B-dependencies"]
+}

.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

.github/workflows/stale.yml

@@ -20,15 +20,29 @@ jobs:
         with:
           stale-issue-message: 'This issue is stale because it has been open 280 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
-          stale-issue-label: 'I-stale'
+          stale-issue-label: 'J-stale'
+          stale-pr-label: 'J-stale'
           days-before-stale: 180
           days-before-close: 14
           exempt-all-milestones: true
       - uses: actions/stale@v9
         with:
           close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
-          stale-issue-label: 'R-awaiting answer'
+          stale-issue-label: 'J-awaiting answer'
           days-before-stale: -1
           days-before-close: 14
-          labels-to-add-when-unstale: 'needs-triaging'
-
+          labels-to-add-when-unstale: 'A-needs-triaging'
+      - uses: actions/stale@v9
+        with:
+          close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
+          stale-issue-label: 'J-logging'
+          days-before-stale: -1
+          days-before-close: 14
+          labels-to-add-when-unstale: 'A-needs-triaging'
+      - uses: actions/stale@v9
+        with:
+          close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
+          stale-issue-label: 'J-issue-template'
+          days-before-stale: -1
+          days-before-close: 14
+          labels-to-add-when-unstale: 'A-needs-triaging'

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/src/webdriver/Alert.cs

@@ -45,7 +45,7 @@ public string? Text
         {
             get
             {
-                Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAlertText, null);
+                Response commandResponse = this.driver.Execute(DriverCommand.GetAlertText, null);
                 return (string?)commandResponse.Value;
             }
         }
@@ -55,15 +55,15 @@ public string? Text
         /// </summary>
         public void Dismiss()
         {
-            this.driver.InternalExecute(DriverCommand.DismissAlert, null);
+            this.driver.Execute(DriverCommand.DismissAlert, null);
         }
 
         /// <summary>
         /// Accepts the alert.
         /// </summary>
         public void Accept()
         {
-            this.driver.InternalExecute(DriverCommand.AcceptAlert, null);
+            this.driver.Execute(DriverCommand.AcceptAlert, null);
         }
 
         /// <summary>
@@ -81,7 +81,7 @@ public void SendKeys(string keysToSend)
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("text", keysToSend);
 
-            this.driver.InternalExecute(DriverCommand.SetAlertValue, parameters);
+            this.driver.Execute(DriverCommand.SetAlertValue, parameters);
         }
     }
 }

dotnet/src/webdriver/Chromium/ChromiumDriver.cs

@@ -361,6 +361,8 @@ public DevToolsSession GetDevToolsSession(int devToolsProtocolVersion)
         /// <summary>
         /// Closes a DevTools session.
         /// </summary>
+        [RequiresUnreferencedCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
+        [RequiresDynamicCode(DevToolsSession.CDP_AOTIncompatibilityMessage)]
         public void CloseDevToolsSession()
         {
             if (this.devToolsSession != null)

dotnet/src/webdriver/Command.cs

@@ -33,7 +33,11 @@ public class Command
     {
         private readonly static JsonSerializerOptions s_jsonSerializerOptions = new()
         {
-            TypeInfoResolver = JsonTypeInfoResolver.Combine(CommandJsonSerializerContext.Default, new DefaultJsonTypeInfoResolver()),
+            TypeInfoResolverChain =
+            {
+                CommandJsonSerializerContext.Default,
+                new DefaultJsonTypeInfoResolver()
+            },
             Converters = { new ResponseValueJsonConverter() }
         };
 
@@ -86,17 +90,14 @@ public string ParametersAsJsonString
         {
             get
             {
-                string parametersString;
                 if (this.Parameters != null && this.Parameters.Count > 0)
                 {
-                    parametersString = JsonSerializer.Serialize(this.Parameters, s_jsonSerializerOptions);
+                    return JsonSerializer.Serialize(this.Parameters, s_jsonSerializerOptions);
                 }
                 else
                 {
-                    parametersString = "{}";
+                    return "{}";
                 }
-
-                return parametersString;
             }
         }
 
@@ -118,7 +119,7 @@ public override string ToString()
         /// <exception cref="ArgumentNullException">If <paramref name="value"/> is <see langword="null"/>.</exception>
         private static Dictionary<string, object?>? ConvertParametersFromJson(string value)
         {
-            Dictionary<string, object?>? parameters = JsonSerializer.Deserialize<Dictionary<string, object?>>(value, s_jsonSerializerOptions);
+            Dictionary<string, object?>? parameters = JsonSerializer.Deserialize<Dictionary<string, object?>>(value, CommandJsonSerializerContext.Default.DictionaryStringObject!);
             return parameters;
         }
     }
@@ -167,5 +168,6 @@ public override string ToString()
     [JsonSerializable(typeof(Dictionary<string, short>))]
     [JsonSerializable(typeof(Dictionary<string, ushort>))]
     [JsonSerializable(typeof(Dictionary<string, string>))]
+    [JsonSourceGenerationOptions(Converters = [typeof(ResponseValueJsonConverter)])]
     internal partial class CommandJsonSerializerContext : JsonSerializerContext;
 }

dotnet/src/webdriver/CookieJar.cs

@@ -32,7 +32,7 @@ public ReadOnlyCollection<Cookie> AllCookies
         {
             get
             {
-                Response response = driver.InternalExecute(DriverCommand.GetAllCookies, new Dictionary<string, object>());
+                Response response = driver.Execute(DriverCommand.GetAllCookies, new Dictionary<string, object>());
 
                 List<Cookie> toReturn = new List<Cookie>();
                 if (response.Value is object?[] cookies)
@@ -65,7 +65,7 @@ public void AddCookie(Cookie cookie)
 
             Dictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("cookie", cookie);
-            driver.InternalExecute(DriverCommand.AddCookie, parameters);
+            driver.Execute(DriverCommand.AddCookie, parameters);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public void DeleteCookieNamed(string name)
 
             Dictionary<string, object> parameters = new() { { "name", name } };
 
-            driver.InternalExecute(DriverCommand.DeleteCookie, parameters);
+            driver.Execute(DriverCommand.DeleteCookie, parameters);
         }
 
         /// <summary>
@@ -105,7 +105,7 @@ public void DeleteCookie(Cookie cookie)
         /// </summary>
         public void DeleteAllCookies()
         {
-            driver.InternalExecute(DriverCommand.DeleteAllCookies, null);
+            driver.Execute(DriverCommand.DeleteAllCookies, null);
         }
 
         /// <summary>
@@ -123,7 +123,7 @@ public void DeleteAllCookies()
 
             try
             {
-                var rawCookie = driver.InternalExecute(DriverCommand.GetCookie, new() { { "name", name } }).Value;
+                var rawCookie = driver.Execute(DriverCommand.GetCookie, new() { { "name", name } }).Value;
 
                 return Cookie.FromDictionary((Dictionary<string, object?>)rawCookie!);
             }

dotnet/src/webdriver/HttpCommandInfo.cs

@@ -49,10 +49,11 @@ public class HttpCommandInfo : CommandInfo
         /// </summary>
         /// <param name="method">Method of the Command</param>
         /// <param name="resourcePath">Relative URL path to the resource used to execute the command</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="method"/> or <paramref name="resourcePath"/> are <see langword="null"/>.</exception>
         public HttpCommandInfo(string method, string resourcePath)
         {
-            this.ResourcePath = resourcePath;
-            this.Method = method;
+            this.ResourcePath = resourcePath ?? throw new ArgumentNullException(nameof(resourcePath));
+            this.Method = method ?? throw new ArgumentNullException(nameof(method));
         }
 
         /// <summary>