Merge branch 'trunk' into remove_network_connection

Author: pujagani

java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java

@@ -89,14 +89,6 @@ public static Optional<URI> getReportedUri(Capabilities caps) {
       case "msedge":
         key = "ms:edgeOptions";
         break;
-      case "firefox":
-        key = "moz:debuggerAddress";
-        if (!caps.is("webSocketUrl")) {
-          LOG.warning(
-              "CDP support for Firefox is deprecated and will be removed in future versions. "
-                  + "Please switch to WebDriver BiDi.");
-        }
-        break;
       default:
         return Optional.empty();
     }

java/src/org/openqa/selenium/firefox/BUILD.bazel

@@ -13,7 +13,6 @@ java_export(
     deps = [
         "//java:auto-service",
         "//java/src/org/openqa/selenium/bidi",
-        "//java/src/org/openqa/selenium/devtools/v85",
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/manager",
         "//java/src/org/openqa/selenium/remote",

java/test/org/openqa/selenium/remote/RemoteWebDriverBuilderTest.java

@@ -490,13 +490,13 @@ public URL getUrl() {
                             SESSION_ID,
                             "capabilities",
                             new ImmutableCapabilities(
-                                "firefox", "caps",
-                                "browserName", "firefox",
-                                "moz:debuggerAddress", uri.toString())))));
+                                "chrome", "caps",
+                                "browserName", "chrome",
+                                "goog:chromeOptions", uri.toString())))));
 
     WebDriver driver =
         RemoteWebDriver.builder()
-            .oneOf(new FirefoxOptions())
+            .oneOf(new ChromeOptions())
             .withDriverService(service)
             .augmentUsing(new Augmenter())
             .connectingWith(config -> req -> response)

py/BUILD.bazel

@@ -520,10 +520,13 @@ py_test_suite(
 py_test_suite(
     name = "test-firefox",
     size = "large",
-    srcs = glob([
-        "test/selenium/webdriver/marionette/**/*.py",
-        "test/selenium/webdriver/firefox/**/*.py",
-    ]),
+    srcs = glob(
+        [
+            "test/selenium/webdriver/marionette/**/*.py",
+            "test/selenium/webdriver/firefox/**/*.py",
+        ],
+        exclude = ["test/selenium/webdriver/common/devtools_tests.py"],
+    ),
     args = [
         "--instafail",
     ] + BROWSERS["firefox"]["args"],

py/test/selenium/webdriver/common/devtools_tests.py

@@ -21,6 +21,7 @@
 
 @pytest.mark.xfail_safari
 @pytest.mark.xfail_firefox
+@pytest.mark.xfail_remote
 def test_check_console_messages(driver, pages):
     with pytest.warns(None) as record:
         devtools, connection = driver.start_devtools()

rb/spec/integration/selenium/webdriver/devtools_spec.rb

@@ -112,9 +112,6 @@ module WebDriver
         expect(logs).to include(
           an_object_having_attributes(type: :log, args: [hash_including('type' => 'object')])
         )
-        expect(logs).to include(
-          an_object_having_attributes(type: :log, args: [hash_including('location')])
-        )
       end
 
       it 'notifies about exceptions' do