Adding a system property that allows to run tests in Safari technolog…

…y preview
SeleniumHQ · Feb 27, 2018 · 2d7b1c3 · 2d7b1c3
1 parent 6cb70c5
commit 2d7b1c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/java/client/src/org/openqa/selenium/safari/SafariOptions.java b/java/client/src/org/openqa/selenium/safari/SafariOptions.java
@@ -101,6 +101,9 @@ public SafariOptions merge(Capabilities extraCapabilities) {
    */
   public static SafariOptions fromCapabilities(Capabilities capabilities)
       throws WebDriverException {
+    if (capabilities instanceof SafariOptions) {
+      return (SafariOptions) capabilities;
+    }
     Object cap = capabilities.getCapability(SafariOptions.CAPABILITY);
     if (cap instanceof SafariOptions) {
       return (SafariOptions) cap;

diff --git a/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java b/java/client/test/org/openqa/selenium/testing/drivers/WebDriverBuilder.java
@@ -64,7 +64,13 @@ public class WebDriverBuilder implements Supplier<WebDriver> {
       })
       .put(Browser.htmlunit, DesiredCapabilities::htmlUnit)
       .put(Browser.operablink, OperaOptions::new)
-      .put(Browser.safari, SafariOptions::new)
+      .put(Browser.safari, () -> {
+        SafariOptions options = new SafariOptions();
+        if (Boolean.getBoolean("selenium.safari.tp")) {
+          options.setUseTechnologyPreview(true);
+        }
+        return options;
+      })
       .build();
 
   public static Capabilities getStandardCapabilitiesFor(Browser browser) {