From a4ec9e9d7c688bf5d9bd5dd4eedc3e68f18b866c Mon Sep 17 00:00:00 2001
From: Alexei Barantsev <barancev@gmail.com>
Date: Thu, 11 Jul 2019 22:38:37 +0300
Subject: [PATCH] [java] Fixing Safari initialization code to be able to use
 Safari TP

---
 .../src/org/openqa/selenium/safari/SafariDriverService.java   | 4 ++--
 java/client/src/org/openqa/selenium/safari/SafariOptions.java | 2 +-
 .../selenium/testing/drivers/DefaultDriverSupplier.java       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/client/src/org/openqa/selenium/safari/SafariDriverService.java b/java/client/src/org/openqa/selenium/safari/SafariDriverService.java
index 534c8f93c6a64..f8e4e6281a8c7 100644
--- a/java/client/src/org/openqa/selenium/safari/SafariDriverService.java
+++ b/java/client/src/org/openqa/selenium/safari/SafariDriverService.java
@@ -59,7 +59,7 @@ public static SafariDriverService createDefaultService() {
   }
 
   static SafariDriverService createDefaultService(SafariOptions options) {
-    return new Builder().build();
+    return new Builder().usingTechnologyPreview(options.getUseTechnologyPreview()).build();
   }
 
   static SafariDriverService createDefaultService(Capabilities caps) {
@@ -128,7 +128,7 @@ protected File findDefaultExecutable() {
         throw new WebDriverException(message.toString());
       }
 
-      return SAFARI_DRIVER_EXECUTABLE;
+      return exe;
     }
 
     private boolean isElCapitanOrLater() {
diff --git a/java/client/src/org/openqa/selenium/safari/SafariOptions.java b/java/client/src/org/openqa/selenium/safari/SafariOptions.java
index 4db87caf5af13..bbc439ce158d0 100644
--- a/java/client/src/org/openqa/selenium/safari/SafariOptions.java
+++ b/java/client/src/org/openqa/selenium/safari/SafariOptions.java
@@ -110,7 +110,7 @@ public static SafariOptions fromCapabilities(Capabilities capabilities)
     } else if (cap instanceof Map) {
       return new SafariOptions(new MutableCapabilities(((Map<String, ?>) cap)));
     } else {
-      return new SafariOptions();
+      return new SafariOptions(capabilities);
     }
   }
 
diff --git a/java/client/test/org/openqa/selenium/testing/drivers/DefaultDriverSupplier.java b/java/client/test/org/openqa/selenium/testing/drivers/DefaultDriverSupplier.java
index d6eb87193f104..bcaec7300953c 100644
--- a/java/client/test/org/openqa/selenium/testing/drivers/DefaultDriverSupplier.java
+++ b/java/client/test/org/openqa/selenium/testing/drivers/DefaultDriverSupplier.java
@@ -52,7 +52,7 @@ public class DefaultDriverSupplier implements Supplier<WebDriver> {
   private Capabilities capabilities;
 
   DefaultDriverSupplier(Capabilities capabilities) {
-    this.capabilities = new ImmutableCapabilities(capabilities);
+    this.capabilities = capabilities;
   }
 
   @Override