From cee6b5c44f2e69f7f104cd866358a6caaeb0d001 Mon Sep 17 00:00:00 2001
From: Marvin Ojwang <mojwang@netflix.com>
Date: Thu, 26 Jan 2017 17:24:20 -0800
Subject: [PATCH] [js] Allow SafariDriver to use Safari Technology Preview

Update CHANGES.md with note that SafariDriver JS bindings now supports Safari Technology Preview

Use correct Closure Compiler annotation for boolean parameters

Set technologyPreview capability on the top-level capabilities object

To be consistent with Java, set technologyPreview boolean in options object and properly extract the options object when creating a session

Add Closer Compiler annotations to useTechnologyPreview helper function

Null check the options_ object within useTechnologyPreview helper function
---
 javascript/node/selenium-webdriver/CHANGES.md |  1 +
 javascript/node/selenium-webdriver/safari.js  | 51 ++++++++++++++++---
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/javascript/node/selenium-webdriver/CHANGES.md b/javascript/node/selenium-webdriver/CHANGES.md
index 2b5f9bb583683..bb8d12728d449 100644
--- a/javascript/node/selenium-webdriver/CHANGES.md
+++ b/javascript/node/selenium-webdriver/CHANGES.md
@@ -13,6 +13,7 @@
   dropping arguments and would never work.
 * Added the ability to use Firefox Nightly
 * If Firefox cannot be found in the default location, look for it on the PATH
+* Allow SafariDriver to use Safari Technology Preview.
 
 ## v3.0.1
 
diff --git a/javascript/node/selenium-webdriver/safari.js b/javascript/node/selenium-webdriver/safari.js
index 97d512bc76b7e..5a57387c1a187 100644
--- a/javascript/node/selenium-webdriver/safari.js
+++ b/javascript/node/selenium-webdriver/safari.js
@@ -68,7 +68,7 @@ class ServiceBuilder extends remote.DriverService.Builder {
 
 
 const OPTIONS_CAPABILITY_KEY = 'safari.options';
-
+const TECHNOLOGY_PREVIEW_OPTIONS_KEY = 'technologyPreview';
 
 /**
  * Configuration options specific to the {@link Driver SafariDriver}.
@@ -89,16 +89,17 @@ class Options {
    * Extracts the SafariDriver specific options from the given capabilities
    * object.
    * @param {!Capabilities} capabilities The capabilities object.
-   * @return {!Options} The ChromeDriver options.
+   * @return {!Options} The SafariDriver options.
    */
   static fromCapabilities(capabilities) {
     var options = new Options();
-
     var o = capabilities.get(OPTIONS_CAPABILITY_KEY);
+
     if (o instanceof Options) {
       options = o;
     } else if (o) {
       options.setCleanSession(o.cleanSession);
+      options.setTechnologyPreview(o[TECHNOLOGY_PREVIEW_OPTIONS_KEY]);
     }
 
     if (capabilities.has(Capability.PROXY)) {
@@ -148,6 +149,22 @@ class Options {
     return this;
   }
 
+  /**
+   * Instruct the SafariDriver to use the Safari Technology Preview if true.
+   * Otherwise, use the release version of Safari. Defaults to using the release version of Safari.
+   *
+   * @param {boolean} useTechnologyPreview
+   * @return {!Options} A self reference.
+   */
+  setTechnologyPreview(useTechnologyPreview) {
+    if (!this.options_) {
+      this.options_ = {};
+    }
+
+    this.options_[TECHNOLOGY_PREVIEW_OPTIONS_KEY] = !!useTechnologyPreview;
+    return this;
+  }
+
   /**
    * Converts this options instance to a {@link Capabilities} object.
    * @param {Capabilities=} opt_capabilities The capabilities to
@@ -179,6 +196,23 @@ class Options {
   }
 }
 
+/**
+ * @param  {(Options|Object<string, *>)=} o The options object
+ * @return {boolean}
+ */
+function useTechnologyPreview(o) {
+  if (o instanceof Options) {
+    return !!(o.options_ && o.options_[TECHNOLOGY_PREVIEW_OPTIONS_KEY]);
+  }
+
+  if (o && typeof o === 'object') {
+    return !!o[TECHNOLOGY_PREVIEW_OPTIONS_KEY];
+  }
+
+  return false;
+}
+
+const SAFARIDRIVER_TECHNOLOGY_PREVIEW_EXE = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver';
 
 /**
  * A WebDriver client for Safari. This class should never be instantiated
@@ -200,14 +234,19 @@ class Driver extends webdriver.WebDriver {
    * @return {!Driver} A new driver instance.
    */
   static createSession(opt_config, opt_flow) {
-    let caps;
+    let caps, exe;
+
     if (opt_config instanceof Options) {
       caps = opt_config.toCapabilities();
     } else {
-      caps = opt_config || Capabilities.safari()
+      caps = opt_config || Capabilities.safari();
+    }
+
+    if (useTechnologyPreview(caps.get(OPTIONS_CAPABILITY_KEY))) {
+      exe = SAFARIDRIVER_TECHNOLOGY_PREVIEW_EXE;
     }
 
-    let service = new ServiceBuilder().build();
+    let service = new ServiceBuilder(exe).build();
     let executor = new http.Executor(
         service.start().then(url => new http.HttpClient(url)));