Merge branch 'trunk' into sm_mixed_output

SeleniumHQ · May 17, 2024 · f4d2030 · f4d2030
2 parents 5ab0c80 + 22386f6
commit f4d2030
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/common/mirror/selenium b/common/mirror/selenium
@@ -23,13 +23,13 @@
  "tag_name": "nightly",
  "assets": [
  {
- "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.21.0-SNAPSHOT.zip"
+ "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.22.0-SNAPSHOT.zip"
  },
  {
- "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.21.0-SNAPSHOT.jar"
+ "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.22.0-SNAPSHOT.jar"
  },
  {
- "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.21.0-SNAPSHOT.zip"
+ "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.22.0-SNAPSHOT.zip"
  }
  ]
  },

diff --git a/dotnet/src/webdriver/Navigator.cs b/dotnet/src/webdriver/Navigator.cs
@@ -17,6 +17,7 @@
 // </copyright>
 
 using System;
+using System.Collections.Generic;
 
 namespace OpenQA.Selenium
 {
@@ -58,7 +59,17 @@ public void Forward()
  /// <param name="url">String of where you want the browser to go to</param>
  public void GoToUrl(string url)
  {
- this.driver.Url = url;
+ if (url == null)
+ {
+ throw new ArgumentNullException(nameof(url), "URL cannot be null.");
+ }
+
+ Dictionary<string, object> parameters = new Dictionary<string, object>
+ {
+ { "url", url }
+ };
+ this.driver.InternalExecute(DriverCommand.Get, parameters);
+
  }
 
  /// <summary>
@@ -72,7 +83,7 @@ public void GoToUrl(Uri url)
  throw new ArgumentNullException(nameof(url), "URL cannot be null.");
  }
 
- this.driver.Url = url.ToString();
+ this.GoToUrl(url.ToString());
  }
 
  /// <summary>

diff --git a/dotnet/src/webdriver/WebDriver.cs b/dotnet/src/webdriver/WebDriver.cs
@@ -109,17 +109,7 @@ public string Url
  return commandResponse.Value.ToString();
  }
 
- set
- {
- if (value == null)
- {
- throw new ArgumentNullException(nameof(value), "Argument 'url' cannot be null.");
- }
-
- Dictionary<string, object> parameters = new Dictionary<string, object>();
- parameters.Add("url", value);
- this.Execute(DriverCommand.Get, parameters);
- }
+ set => new Navigator(this).GoToUrl(value);
  }
 
  /// <summary>

diff --git a/rb/lib/selenium/webdriver/common/logger.rb b/rb/lib/selenium/webdriver/common/logger.rb
@@ -185,7 +185,7 @@ def create_logger(name, level:)
  logger.progname = name
  logger.level = level
  logger.formatter = proc do |severity, time, progname, msg|
- "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n"
+ "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n".force_encoding('UTF-8')
  end
 
  logger