Drop support for ancient geckodriver versions

SeleniumHQ · Jul 10, 2018 · 3ffb8eb · 3ffb8eb
1 parent 52a2f6a
commit 3ffb8eb
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 233 deletions.
diff --git a/java/client/src/org/openqa/selenium/remote/BUCK b/java/client/src/org/openqa/selenium/remote/BUCK
@@ -82,7 +82,6 @@ java_library(name = 'remote-lib',
     'ErrorHandler.java',
     'ExecuteMethod.java',
     'FileDetector.java',
-    'Gecko013ProtocolResponse.java',
     'HandshakeResponse.java',
     'HttpCommandExecutor.java',
     'InitialHandshakeResponse.java',

diff --git a/java/client/src/org/openqa/selenium/remote/Gecko013ProtocolResponse.java b/java/client/src/org/openqa/selenium/remote/Gecko013ProtocolResponse.java
diff --git a/java/client/src/org/openqa/selenium/remote/NewSessionPayload.java b/java/client/src/org/openqa/selenium/remote/NewSessionPayload.java
@@ -237,13 +237,10 @@ public void writeTo(Appendable appendable) throws IOException {
       json.name("desiredCapabilities");
       json.write(ossFirst);
 
-      // And write the first capability for gecko13
+      // Now for the w3c capabilities
       json.name("capabilities");
       json.beginObject();
 
-      json.name("desiredCapabilities");
-      json.write(first);
-
       // Then write everything into the w3c payload. Because of the way we do this, it's easiest
       // to just populate the "firstMatch" section. The spec says it's fine to omit the
       // "alwaysMatch" field, so we do this.

diff --git a/java/client/src/org/openqa/selenium/remote/ProtocolHandshake.java b/java/client/src/org/openqa/selenium/remote/ProtocolHandshake.java
@@ -118,7 +118,6 @@ private Optional<Result> createSession(HttpClient client, InputStream newSession
 
     return Stream.of(
         new JsonWireProtocolResponse().getResponseFunction(),
-        new Gecko013ProtocolResponse().getResponseFunction(),
         new W3CHandshakeResponse().getResponseFunction())
         .map(func -> func.apply(initialResponse))
         .filter(Optional::isPresent)

diff --git a/java/client/test/org/openqa/selenium/remote/BUCK b/java/client/test/org/openqa/selenium/remote/BUCK
@@ -23,7 +23,6 @@ java_test(name = 'client-tests',
     'AugmenterTest.java',
     'BaseAugmenterTest.java',
     'ErrorHandlerTest.java',
-    'Gecko013ProtocolResponseTest.java',
     'JdkAugmenterTest.java',
     'JsonWireProtocolResponseTest.java',
     'ProtocolHandshakeTest.java',

diff --git a/java/client/test/org/openqa/selenium/remote/Gecko013ProtocolResponseTest.java b/java/client/test/org/openqa/selenium/remote/Gecko013ProtocolResponseTest.java
diff --git a/java/client/test/org/openqa/selenium/remote/RemoteClientTests.java b/java/client/test/org/openqa/selenium/remote/RemoteClientTests.java
@@ -26,7 +26,6 @@
     AugmenterTest.class,
     ErrorHandlerTest.class,
     CircularOutputStreamTest.class,
-    Gecko013ProtocolResponseTest.class,
     JsonWireProtocolResponseTest.class,
     ProtocolHandshakeTest.class,
     RemoteLogsTest.class,

diff --git a/java/client/test/org/openqa/selenium/remote/W3CRemoteDriverTest.java b/java/client/test/org/openqa/selenium/remote/W3CRemoteDriverTest.java
@@ -200,7 +200,7 @@ public void ifARemoteUrlIsGivenThatIsUsedForTheSession() throws MalformedURLExce
   }
 
   static class FakeDriverService extends DriverService {
-    public FakeDriverService() throws IOException {
+    FakeDriverService() throws IOException {
       super(new File("."), 0, null, null);
     }
   }