Fixes #2680. Use port to check safaridriver availability. Ensure the new safari driver receives non null required capabilities. (#2685)

Author: hypnoce

java/client/src/org/openqa/selenium/safari/SafariDriver.java

@@ -75,18 +75,32 @@ public SafariDriver(Capabilities desiredCapabilities) {
    * @param safariOptions safari specific options / capabilities for the driver
    */
   public SafariDriver(SafariOptions safariOptions) {
-    super(getExecutor(safariOptions), safariOptions.toCapabilities());
+    super(getExecutor(safariOptions), safariOptions.toCapabilities(), requiredCapabilities(safariOptions));
+  }
+
+  /**
+   * Ensure the new safaridriver receives non null required capabilities.
+   */
+  private static Capabilities requiredCapabilities(SafariOptions options) {
+    if (isLegacy(options)) {
+      return null;
+    }
+    return new DesiredCapabilities();
   }
 
   private static CommandExecutor getExecutor(SafariOptions options) {
-    Object useLegacy = options.toCapabilities().getCapability(USE_LEGACY_DRIVER_CAPABILITY);
     SafariDriverService service = SafariDriverService.createDefaultService(options);
-    if ((useLegacy == null || !(Boolean)useLegacy) && service != null) {
+    if (isLegacy(options) && service != null) {
       return new DriverCommandExecutor(service);
     }
     return new SafariDriverCommandExecutor(options);
   }
 
+  private static boolean isLegacy(SafariOptions options) {
+    Object useLegacy = options.toCapabilities().getCapability(USE_LEGACY_DRIVER_CAPABILITY);
+    return useLegacy != null && (Boolean)useLegacy;
+  }
+
   @Override
   public void setFileDetector(FileDetector detector) {
     throw new WebDriverException(

java/client/src/org/openqa/selenium/safari/SafariDriverService.java

@@ -17,14 +17,19 @@
 
 package org.openqa.selenium.safari;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
 import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.net.PortProber;
 import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.concurrent.ExecutionException;
 
 public class SafariDriverService extends DriverService {
 
@@ -42,6 +47,15 @@ public static SafariDriverService createDefaultService(SafariOptions options) {
     return null;
   }
 
+  @Override
+  protected void waitUntilAvailable() throws MalformedURLException {
+    try {
+      PortProber.waitForPortUp(getUrl().getPort(), 20, SECONDS);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
   public static class Builder extends DriverService.Builder<
     SafariDriverService, SafariDriverService.Builder> {