[js] Remove meaningless Safari options

Fixes #4965

Author: jleyba

javascript/node/selenium-webdriver/CHANGES.md

@@ -72,7 +72,9 @@ mode.
 *  Changes to `firefox.Options`
    -  Removed setLoggingPreferences (was a no-op)
 *  Changes to `safari.Options`
+   -  Removed setCleanSession (was a no-op)
    -  Removed setLoggingPreferences (was a no-op)
+   -  Removed setProxy (was a no-op)
 *  Changes to `lib/error`:
    -   Added
        -   ElementClickInterceptedError

javascript/node/selenium-webdriver/safari.js

@@ -88,9 +88,6 @@ class Options {
   constructor() {
     /** @private {Object<string, *>} */
     this.options_ = null;
-
-    /** @private {?./lib/proxy.Config} */
-    this.proxy_ = null;
   }
 
   /**
@@ -100,49 +97,18 @@ class Options {
    * @return {!Options} The SafariDriver options.
    */
   static fromCapabilities(capabilities) {
-    var options = new Options();
-    var o = capabilities.get(OPTIONS_CAPABILITY_KEY);
+    let options = new Options();
+    let 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)) {
-      options.setProxy(capabilities.get(Capability.PROXY));
-    }
-
     return options;
   }
 
-  /**
-   * Sets whether to force Safari to start with a clean session. Enabling this
-   * option will cause all global browser data to be deleted.
-   * @param {boolean} clean Whether to make sure the session has no cookies,
-   *     cache entries, local storage, or databases.
-   * @return {!Options} A self reference.
-   */
-  setCleanSession(clean) {
-    if (!this.options_) {
-      this.options_ = {};
-    }
-    this.options_['cleanSession'] = clean;
-    return this;
-  }
-
-  /**
-   * Sets the proxy to use.
-   *
-   * @param {./lib/proxy.Config} proxy The proxy configuration to use.
-   * @return {!Options} A self reference.
-   */
-  setProxy(proxy) {
-    this.proxy_ = proxy;
-    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.
@@ -166,10 +132,7 @@ class Options {
    * @return {!Capabilities} The capabilities.
    */
   toCapabilities(opt_capabilities) {
-    var caps = opt_capabilities || Capabilities.safari();
-    if (this.proxy_) {
-      caps.set(Capability.PROXY, this.proxy_);
-    }
+    let caps = opt_capabilities || Capabilities.safari();
     if (this.options_) {
       caps.set(OPTIONS_CAPABILITY_KEY, this);
     }

javascript/node/selenium-webdriver/test/safari_test.js

@@ -19,68 +19,11 @@
 
 const assert = require('assert');
 
-const proxy = require('../proxy');
 const safari = require('../safari');
 const test = require('../lib/test');
 const webdriver = require('..');
 
 
-describe('safari.Options', function() {
-  describe('fromCapabilities', function() {
-    it('returns a new Options instance  if none were defined', function() {
-      let options = safari.Options.fromCapabilities(
-        new webdriver.Capabilities());
-      assert(options instanceof safari.Options);
-    });
-
-    it('returns the options instance if present', function() {
-      let options = new safari.Options().setCleanSession(true),
-        caps = options.toCapabilities();
-      assert.equal(safari.Options.fromCapabilities(caps), options);
-    });
-
-    it('extracts supported WebDriver capabilities', function() {
-      let proxyPrefs = proxy.direct(),
-        caps = webdriver.Capabilities.chrome()
-          .set(webdriver.Capability.PROXY, proxyPrefs);
-
-      let options = safari.Options.fromCapabilities(caps);
-      assert.equal(options.proxy_, proxyPrefs);
-    });
-  });
-
-  describe('toCapabilities', function() {
-    let options;
-
-    before(function() {
-      options = new safari.Options()
-        .setCleanSession(true);
-    });
-
-    it('returns a new capabilities object if one is not provided', function() {
-      let caps = options.toCapabilities();
-      assert(caps instanceof webdriver.Capabilities);
-      assert.equal(caps.get('browserName'), 'safari');
-      assert.equal(caps.get('safari.options'), options);
-    });
-
-    it('adds to input capabilities object', function() {
-      let caps = webdriver.Capabilities.safari();
-      assert.equal(options.toCapabilities(caps), caps);
-      assert.equal(caps.get('safari.options'), options);
-    });
-
-    it('sets generic driver capabilities', function() {
-      let proxyPrefs = proxy.direct();
-
-      options.setProxy(proxyPrefs);
-
-      let caps = options.toCapabilities();
-      assert.equal(caps.get('proxy'), proxyPrefs);
-    });
-  });
-});
-
 test.suite(function(env) {
   describe('safaridriver', function() {
     let service;