Skip to content

Commit

Permalink
Merge branch 'trunk' into py-nightly
Browse files Browse the repository at this point in the history
Signed-off-by: Viet Nguyen Duc <[email protected]>
  • Loading branch information
VietND96 committed Nov 20, 2024
2 parents 4c0944f + 8f725b3 commit 5678b5d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@ namespace :py do
new_version = updated_version(old_version, arguments[:version], nightly)

['py/setup.py',
'py/pyproject.toml',
'py/BUILD.bazel',
'py/selenium/__init__.py',
'py/selenium/webdriver/__init__.py',
Expand Down
1 change: 1 addition & 0 deletions dotnet/src/webdriver/Firefox/FirefoxDriver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ public DevToolsSession GetDevToolsSession(int devToolsProtocolVersion)
/// Creates a session to communicate with a browser using a Developer Tools debugging protocol.
/// </summary>
/// <returns>The active session to use to communicate with the Developer Tools debugging protocol.</returns>
[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)
Expand Down
11 changes: 11 additions & 0 deletions dotnet/src/webdriver/Remote/RemoteWebDriver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// under the License.
// </copyright>

using OpenQA.Selenium.Internal.Logging;
using OpenQA.Selenium.DevTools;
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -63,6 +64,8 @@ namespace OpenQA.Selenium.Remote
/// </example>
public class RemoteWebDriver : WebDriver, IDevTools, IHasDownloads
{
private static readonly ILogger _logger = OpenQA.Selenium.Internal.Logging.Log.GetLogger(typeof(RemoteWebDriver));

/// <summary>
/// The name of the Selenium grid remote DevTools end point capability.
/// </summary>
Expand Down Expand Up @@ -425,6 +428,14 @@ public ReadOnlyCollection<IWebElement> FindElementsByCssSelector(string cssSelec
/// <returns>The active session to use to communicate with the Developer Tools debugging protocol.</returns>
public DevToolsSession GetDevToolsSession()
{
if (this.Capabilities.GetCapability(CapabilityType.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 });
}

Expand Down

0 comments on commit 5678b5d

Please sign in to comment.