Skip to content

Commit 2634ecf

Browse files
committed
[grid] remove more firefox devtools leftovers SeleniumHQ#15323
1 parent 75ae3ad commit 2634ecf

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

java/src/org/openqa/selenium/firefox/GeckoDriverInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public boolean isSupporting(Capabilities capabilities) {
5555

5656
@Override
5757
public boolean isSupportingCdp() {
58-
return true;
58+
return false;
5959
}
6060

6161
@Override

java/src/org/openqa/selenium/grid/node/ProxyNodeWebsockets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class ProxyNodeWebsockets
5454
private static final UrlTemplate VNC_TEMPLATE = new UrlTemplate("/session/{sessionId}/se/vnc");
5555
private static final Logger LOG = Logger.getLogger(ProxyNodeWebsockets.class.getName());
5656
private static final ImmutableSet<String> CDP_ENDPOINT_CAPS =
57-
ImmutableSet.of("goog:chromeOptions", "moz:debuggerAddress", "ms:edgeOptions");
57+
ImmutableSet.of("goog:chromeOptions", "ms:edgeOptions");
5858
private final HttpClient.Factory clientFactory;
5959
private final Node node;
6060
private final String gridSubPath;

java/test/org/openqa/selenium/devtools/CdpEndpointFinderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ void shouldReturnUriIfPresent() {
5252
}
5353

5454
@Test
55-
void shouldReturnUriIfPresentAndIsAtTopLevel() {
55+
void shouldNotDetectFirefoxDevTools() {
5656
Capabilities caps =
5757
new Json().toType("{\"moz:debuggerAddress\": \"localhost:93487\" }", Capabilities.class);
5858

5959
Optional<URI> uri = CdpEndpointFinder.getReportedUri("moz:debuggerAddress", caps);
6060

61-
assertThat(uri).contains(URI.create("http://localhost:93487"));
61+
assertThat(uri).isEmpty();
6262
}
6363
}

java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,14 @@ void fullMatchExtensionCaps() {
7676
CapabilityType.PLATFORM_NAME,
7777
Platform.WINDOWS,
7878
"se:downloadsEnabled",
79-
true,
80-
"moz:debuggerAddress",
81-
"127.0.0.1:34959");
79+
true);
8280
Capabilities capabilities =
8381
new ImmutableCapabilities(
8482
CapabilityType.BROWSER_NAME,
8583
"firefox",
8684
CapabilityType.PLATFORM_NAME,
8785
Platform.WINDOWS,
8886
"se:downloadsEnabled",
89-
true,
90-
"moz:debuggerAddress",
9187
true);
9288
assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
9389
}

0 commit comments

Comments
 (0)