From 0fc56dbc382148cf9a5ca6afab690e37ecb42cb8 Mon Sep 17 00:00:00 2001 From: Puja Jagani Date: Fri, 15 Nov 2024 10:56:04 +0530 Subject: [PATCH 1/4] [dotnet] Add CDP deprecation warning for Firefox --- dotnet/src/webdriver/Firefox/FirefoxDriver.cs | 1 + dotnet/src/webdriver/Remote/RemoteWebDriver.cs | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dotnet/src/webdriver/Firefox/FirefoxDriver.cs b/dotnet/src/webdriver/Firefox/FirefoxDriver.cs index 3d573dc47a91d..f7dce1709dfa7 100644 --- a/dotnet/src/webdriver/Firefox/FirefoxDriver.cs +++ b/dotnet/src/webdriver/Firefox/FirefoxDriver.cs @@ -401,6 +401,7 @@ public DevToolsSession GetDevToolsSession(int devToolsProtocolVersion) /// Creates a session to communicate with a browser using a Developer Tools debugging protocol. /// /// The active session to use to communicate with the Developer Tools debugging protocol. + [Obsolete("CDP support for Firefox is deprecated and will be removed in future versions. Please switch to WebDriver BiDi.")] public DevToolsSession GetDevToolsSession(DevToolsOptions options) { if (this.devToolsSession == null) diff --git a/dotnet/src/webdriver/Remote/RemoteWebDriver.cs b/dotnet/src/webdriver/Remote/RemoteWebDriver.cs index 35a32af124d78..6433cec3a9632 100644 --- a/dotnet/src/webdriver/Remote/RemoteWebDriver.cs +++ b/dotnet/src/webdriver/Remote/RemoteWebDriver.cs @@ -63,6 +63,8 @@ namespace OpenQA.Selenium.Remote /// public class RemoteWebDriver : WebDriver, IDevTools, IHasDownloads { + private readonly ILogger _logger = Log.GetLogger(typeof(RemoteWebDriver)); + /// /// The name of the Selenium grid remote DevTools end point capability. /// @@ -425,6 +427,14 @@ public ReadOnlyCollection FindElementsByCssSelector(string cssSelec /// The active session to use to communicate with the Developer Tools debugging protocol. public DevToolsSession GetDevToolsSession() { + if (this.Capabilities.GetCapability(BrowserName) == "firefox") + { + if (_logger.IsEnabled(LogEventLevel.Warn)) + { + _logger.Warn("CDP support for Firefox is deprecated and will be removed in future versions. Please switch to WebDriver BiDi."); + } + } + return GetDevToolsSession(new DevToolsOptions() { ProtocolVersion = DevToolsSession.AutoDetectDevToolsProtocolVersion }); } From 3fd65267152f01e08a113c6dcf046a908dfdd196 Mon Sep 17 00:00:00 2001 From: Puja Jagani Date: Fri, 15 Nov 2024 14:47:30 +0530 Subject: [PATCH 2/4] Fix build and formatting --- dotnet/src/webdriver/Remote/RemoteWebDriver.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dotnet/src/webdriver/Remote/RemoteWebDriver.cs b/dotnet/src/webdriver/Remote/RemoteWebDriver.cs index 6433cec3a9632..8e5c044e6bd3f 100644 --- a/dotnet/src/webdriver/Remote/RemoteWebDriver.cs +++ b/dotnet/src/webdriver/Remote/RemoteWebDriver.cs @@ -17,6 +17,7 @@ // under the License. // +using OpenQA.Selenium.Internal.Logging; using OpenQA.Selenium.DevTools; using System; using System.Collections.Generic; @@ -64,7 +65,7 @@ namespace OpenQA.Selenium.Remote public class RemoteWebDriver : WebDriver, IDevTools, IHasDownloads { private readonly ILogger _logger = Log.GetLogger(typeof(RemoteWebDriver)); - + /// /// The name of the Selenium grid remote DevTools end point capability. /// @@ -430,8 +431,8 @@ public DevToolsSession GetDevToolsSession() if (this.Capabilities.GetCapability(BrowserName) == "firefox") { if (_logger.IsEnabled(LogEventLevel.Warn)) - { - _logger.Warn("CDP support for Firefox is deprecated and will be removed in future versions. Please switch to WebDriver BiDi."); + { + _logger.Warn("CDP support for Firefox is deprecated and will be removed in future versions. Please switch to WebDriver BiDi."); } } From 474bf17e364fcf227fe87c9eb0be98c6952099f1 Mon Sep 17 00:00:00 2001 From: Puja Jagani Date: Fri, 15 Nov 2024 19:15:53 +0530 Subject: [PATCH 3/4] Fix build --- dotnet/src/webdriver/Remote/RemoteWebDriver.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dotnet/src/webdriver/Remote/RemoteWebDriver.cs b/dotnet/src/webdriver/Remote/RemoteWebDriver.cs index 8e5c044e6bd3f..0477a8d77cf40 100644 --- a/dotnet/src/webdriver/Remote/RemoteWebDriver.cs +++ b/dotnet/src/webdriver/Remote/RemoteWebDriver.cs @@ -64,7 +64,7 @@ namespace OpenQA.Selenium.Remote /// public class RemoteWebDriver : WebDriver, IDevTools, IHasDownloads { - private readonly ILogger _logger = Log.GetLogger(typeof(RemoteWebDriver)); + private static readonly ILogger _logger = QA.Selenium.Internal.Logging.Log.GetLogger(typeof(RemoteWebDriver)); /// /// The name of the Selenium grid remote DevTools end point capability. @@ -428,7 +428,7 @@ public ReadOnlyCollection FindElementsByCssSelector(string cssSelec /// The active session to use to communicate with the Developer Tools debugging protocol. public DevToolsSession GetDevToolsSession() { - if (this.Capabilities.GetCapability(BrowserName) == "firefox") + if (this.Capabilities.GetCapability(CapabilityType.BrowserName) == "firefox") { if (_logger.IsEnabled(LogEventLevel.Warn)) { From 25d1f6e51f81d9ac0f5f355873d5f70582019f25 Mon Sep 17 00:00:00 2001 From: Puja Jagani Date: Mon, 18 Nov 2024 08:55:51 +0530 Subject: [PATCH 4/4] Update dotnet/src/webdriver/Remote/RemoteWebDriver.cs Co-authored-by: Nikolay Borisenko <22616990+nvborisenko@users.noreply.github.com> --- dotnet/src/webdriver/Remote/RemoteWebDriver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet/src/webdriver/Remote/RemoteWebDriver.cs b/dotnet/src/webdriver/Remote/RemoteWebDriver.cs index 0477a8d77cf40..8483eb2fbc3ec 100644 --- a/dotnet/src/webdriver/Remote/RemoteWebDriver.cs +++ b/dotnet/src/webdriver/Remote/RemoteWebDriver.cs @@ -64,7 +64,7 @@ namespace OpenQA.Selenium.Remote /// public class RemoteWebDriver : WebDriver, IDevTools, IHasDownloads { - private static readonly ILogger _logger = QA.Selenium.Internal.Logging.Log.GetLogger(typeof(RemoteWebDriver)); + private static readonly ILogger _logger = OpenQA.Selenium.Internal.Logging.Log.GetLogger(typeof(RemoteWebDriver)); /// /// The name of the Selenium grid remote DevTools end point capability.