selenium-webdriver 2.48.1 → 2.49.0

data/lib/selenium/webdriver/remote/w3c_capabilities.rb

@@ -49,6 +49,7 @@ module Selenium
         end
 
         alias_method :version, :browser_version
+        alias_method :platform, :platform_name
 
         #
         # Convenience methods for the common choices.
@@ -64,19 +65,19 @@ module Selenium
           end
 
           def firefox(opts = {})
+            opts[:browser_version] = opts.delete :version
+            opts[:platform_name] = opts.delete :platform
+
             new({
-              :browser_name => "firefox"
+              :browser_name => "firefox",
+              :marionette => true
                 }.merge(opts))
           end
 
           alias_method :ff, :firefox
 
           def w3c?(opts = {})
-            return false unless opts[:desired_capabilities].is_a?(W3CCapabilities) || opts.delete(:marionette)
-            Firefox::Binary.path = ENV['MARIONETTE_PATH'] if ENV['MARIONETTE_PATH']
-            firefox_version = Firefox::Binary.version
-            raise ArgumentError, "Firefox Version #{firefox_version} does not support W3CCapabilities" if firefox_version < 43
-            true
+            opts[:desired_capabilities].is_a?(W3CCapabilities) || opts[:marionette]
           end
 
           #
@@ -86,20 +87,38 @@ module Selenium
           def json_create(data)
             data = data.dup
 
+            # Convert due to Remote Driver implementation
+            data["browserVersion"] = data.delete("version") if data["version"]
+            data["platformName"] = data.delete("platform") if data["platform"]
+
             caps = new
-            caps.browser_name = data.delete("browserName")
-            caps.browser_version = data.delete("browserVersion")
-            caps.platform_name = data.delete("platformName").downcase.to_sym if data.has_key?('platform')
-            caps.platform_version = data.delete("platformVersion")
-            caps.accept_ssl_certs = data.delete("acceptSslCerts")
-            caps.takes_screenshot = data.delete("takesScreenshot  ")
-            caps.takes_element_screenshot = data.delete("takesElementScreenshot")
-            caps.page_load_strategy = data.delete("pageLoadStrategy")
-            caps.proxy = Proxy.json_create(data['proxy']) if data.has_key?('proxy')
+            caps.browser_name = data.delete("browserName") if data["browserName"]
+            caps.browser_version = data.delete("browserVersion") if data["browserVersion"]
+            caps.platform_name = data.delete("platformName") if data["platformName"]
+            caps.platform_version = data.delete("platformVersion") if data["platformVersion"]
+            caps.accept_ssl_certs = data.delete("acceptSslCerts") if data["acceptSslCerts"]
+            caps.takes_screenshot = data.delete("takesScreenshot") if data["takesScreenshot"]
+            caps.takes_element_screenshot = data.delete("takesElementScreenshot") if data["takesElementScreenshot"]
+            caps.page_load_strategy = data.delete("pageLoadStrategy") if data["pageloadStrategy"]
+            caps.proxy = Proxy.json_create(data['proxy']) if data['proxy']
+
+            # Remote Server Specific
+            caps[:remote_session_id] = data.delete('webdriver.remote.sessionid')
+
+            # Obsolete capabilities returned by Remote Server
+            data.delete("javascriptEnabled")
+            data.delete('cssSelectorsEnabled')
+
+            # Marionette Specific
+            caps[:specification_level] = data.delete("specificaionLevel")
+            caps[:xul_app_id] = data.delete("XULappId")
+            caps[:raise_accessibility_exceptions] = data.delete('raisesAccessibilityExceptions')
+            caps[:rotatable] = data.delete('rotatable')
+            caps[:app_build_id] = data.delete('appBuildId')
+            caps[:device] = data.delete('device')
 
             # any remaining pairs will be added as is, with no conversion
             caps.merge!(data)
-
             caps
           end
         end

data/lib/selenium/webdriver/remote/w3c_commands.rb

@@ -50,7 +50,7 @@ class Selenium::WebDriver::Remote::W3CBridge
   command :closeWindow,                :delete,  "session/:session_id/window"
   command :switchToWindow,             :post,    "session/:session_id/window"
   command :getWindowHandles,           :get,     "session/:session_id/window/handles"
-  command :fullscreenWindow,           :post,    "session/:session_id/window/window/fullscreen"
+  command :fullscreenWindow,           :post,    "session/:session_id/window/fullscreen"
   command :maximizeWindow,             :post,    "session/:session_id/window/maximize"
   command :setWindowSize,              :post,    "session/:session_id/window/size"
   command :getWindowSize,              :get,     "session/:session_id/window/size"
@@ -66,7 +66,6 @@ class Selenium::WebDriver::Remote::W3CBridge
   command :findChildElement,           :post,    "session/:session_id/element/:id/element"
   command :findChildElements,          :post,    "session/:session_id/element/:id/elements"
   command :getActiveElement,           :post,    "session/:session_id/element/active"
-  command :isElementDisplayed,         :get,     "session/:session_id/element/:id/displayed"
   command :isElementSelected,          :get,     "session/:session_id/element/:id/selected"
   command :getElementAttribute,        :get,     "session/:session_id/element/:id/attribute/:name"
   command :getElementProperty,         :get,     "session/:session_id/element/:id/property/:name"

data/lib/selenium/webdriver/safari/bridge.rb

@@ -104,7 +104,7 @@ module Selenium
 
         def prepare_connect_file
           # TODO: use tempfile?
-          path = File.join(Dir.tmpdir, "safaridriver-#{Time.now.to_i}.html")
+          path = File.join(Dir.tmpdir, "safaridriver-#{Time.now.usec}.html")
 
           File.open(path, 'w') do |io|
             io << "<!DOCTYPE html><script>window.location = '#{@server.uri}';</script>"

data/lib/selenium/webdriver/safari/browser.rb

@@ -23,6 +23,8 @@ module Selenium
 
       class Browser
         def start(*args)
+          Platform.exit_hook { stop } # make sure we don't leave the browser running
+
           @process = ChildProcess.new(Safari.path, *args)
           @process.io.inherit! if $DEBUG
           @process.start

data/lib/selenium/webdriver/safari/options.rb

@@ -21,6 +21,8 @@ module Selenium
   module WebDriver
     module Safari
       class Options
+        DEFAULT_PORT = 56485
+
         attr_accessor :port, :data_dir, :skip_extension_installation
 
         def initialize(opts = {})
@@ -40,16 +42,16 @@ module Selenium
 
         def as_json
           {
-            'port'                      => port,
-            'dataDir'                   => data_dir,
-            'cleanSession'              => clean_session?,
+            'port'         => port,
+            'dataDir'      => data_dir,
+            'cleanSession' => clean_session?,
           }
         end
 
         private
 
         def extract_options(opts)
-          @port          = Integer(opts[:port] || PortProber.random)
+          @port          = Integer(opts[:port] || DEFAULT_PORT)
           @data_dir      = opts[:custom_data_dir] || opts[:data_dir]
           @clean_session = opts[:clean_session]
         end

data/lib/selenium/webdriver/safari/resources/client.js

@@ -1,4 +1,4 @@
-var COMPILED = !0, goog = goog || {};
+'use strict';var COMPILED = !0, goog = goog || {};
 goog.global = this;
 goog.isDef = function(a) {
   return void 0 !== a;
@@ -158,7 +158,7 @@ goog.loadedModules_ = {};
 goog.DEPENDENCIES_ENABLED = !COMPILED && goog.ENABLE_DEBUG_LOADER;
 goog.DEPENDENCIES_ENABLED && (goog.dependencies_ = {pathIsModule:{}, nameToPath:{}, requires:{}, visited:{}, written:{}, deferred:{}}, goog.inHtmlDocument_ = function() {
   var a = goog.global.document;
-  return "undefined" != typeof a && "write" in a;
+  return null != a && "write" in a;
 }, goog.findBasePath_ = function() {
   if (goog.isDef(goog.global.CLOSURE_BASE_PATH)) {
     goog.basePath = goog.global.CLOSURE_BASE_PATH;
@@ -207,10 +207,12 @@ goog.DEPENDENCIES_ENABLED && (goog.dependencies_ = {pathIsModule:{}, nameToPath:
     delete goog.dependencies_.deferred[a];
     goog.globalEval(b);
   }
+}, goog.loadModuleFromUrl = function(a) {
+  goog.retrieveAndExecModule_(a);
 }, goog.loadModule = function(a) {
   var b = goog.moduleLoaderState_;
   try {
-    goog.moduleLoaderState_ = {moduleName:void 0};
+    goog.moduleLoaderState_ = {moduleName:void 0, declareLegacyNamespace:!1};
     var c;
     if (goog.isFunction(a)) {
       c = a.call(goog.global, {});
@@ -509,7 +511,7 @@ goog.setCssNameMapping = function(a, b) {
 !COMPILED && goog.global.CLOSURE_CSS_NAME_MAPPING && (goog.cssNameMapping_ = goog.global.CLOSURE_CSS_NAME_MAPPING);
 goog.getMsg = function(a, b) {
   b && (a = a.replace(/\{\$([^}]+)}/g, function(a, d) {
-    return d in b ? b[d] : a;
+    return null != b && d in b ? b[d] : a;
   }));
   return a;
 };
@@ -714,8 +716,7 @@ goog.string.caseInsensitiveCompare = function(a, b) {
   var c = String(a).toLowerCase(), d = String(b).toLowerCase();
   return c < d ? -1 : c == d ? 0 : 1;
 };
-goog.string.numerateCompareRegExp_ = /(\.\d+)|(\d+)|(\D+)/g;
-goog.string.numerateCompare = function(a, b) {
+goog.string.numberAwareCompare_ = function(a, b, c) {
   if (a == b) {
     return 0;
   }
@@ -725,14 +726,22 @@ goog.string.numerateCompare = function(a, b) {
   if (!b) {
     return 1;
   }
-  for (var c = a.toLowerCase().match(goog.string.numerateCompareRegExp_), d = b.toLowerCase().match(goog.string.numerateCompareRegExp_), e = Math.min(c.length, d.length), f = 0;f < e;f++) {
-    var g = c[f], h = d[f];
-    if (g != h) {
-      return c = parseInt(g, 10), !isNaN(c) && (d = parseInt(h, 10), !isNaN(d) && c - d) ? c - d : g < h ? -1 : 1;
+  for (var d = a.toLowerCase().match(c), e = b.toLowerCase().match(c), f = Math.min(d.length, e.length), g = 0;g < f;g++) {
+    c = d[g];
+    var h = e[g];
+    if (c != h) {
+      return a = parseInt(c, 10), !isNaN(a) && (b = parseInt(h, 10), !isNaN(b) && a - b) ? a - b : c < h ? -1 : 1;
     }
   }
-  return c.length != d.length ? c.length - d.length : a < b ? -1 : 1;
+  return d.length != e.length ? d.length - e.length : a < b ? -1 : 1;
 };
+goog.string.intAwareCompare = function(a, b) {
+  return goog.string.numberAwareCompare_(a, b, /\d+|\D+/g);
+};
+goog.string.floatAwareCompare = function(a, b) {
+  return goog.string.numberAwareCompare_(a, b, /\d+|\.\d+|\D+/g);
+};
+goog.string.numerateCompare = goog.string.floatAwareCompare;
 goog.string.urlEncode = function(a) {
   return encodeURIComponent(String(a));
 };
@@ -845,13 +854,10 @@ goog.string.truncateMiddle = function(a, b, c, d) {
   c && (a = goog.string.htmlEscape(a));
   return a;
 };
-goog.string.specialEscapeChars_ = {"\x00":"\\0", "\b":"\\b", "\f":"\\f", "\n":"\\n", "\r":"\\r", "\t":"\\t", "\x0B":"\\x0B", '"':'\\"', "\\":"\\\\"};
+goog.string.specialEscapeChars_ = {"\x00":"\\0", "\b":"\\b", "\f":"\\f", "\n":"\\n", "\r":"\\r", "\t":"\\t", "\x0B":"\\x0B", '"':'\\"', "\\":"\\\\", "<":"<"};
 goog.string.jsEscapeCache_ = {"'":"\\'"};
 goog.string.quote = function(a) {
   a = String(a);
-  if (a.quote) {
-    return a.quote();
-  }
   for (var b = ['"'], c = 0;c < a.length;c++) {
     var d = a.charAt(c), e = d.charCodeAt(0);
     b[c + 1] = goog.string.specialEscapeChars_[d] || (31 < e && 127 > e ? d : goog.string.escapeChar(d));
@@ -934,7 +940,7 @@ goog.string.getRandomString = function() {
 };
 goog.string.compareVersions = function(a, b) {
   for (var c = 0, d = goog.string.trim(String(a)).split("."), e = goog.string.trim(String(b)).split("."), f = Math.max(d.length, e.length), g = 0;0 == c && g < f;g++) {
-    var h = d[g] || "", k = e[g] || "", l = RegExp("(\\d*)(\\D*)", "g"), p = RegExp("(\\d*)(\\D*)", "g");
+    var h = d[g] || "", k = e[g] || "", l = /(\d*)(\D*)/g, p = /(\d*)(\D*)/g;
     do {
       var m = l.exec(h) || ["", "", ""], n = p.exec(k) || ["", "", ""];
       if (0 == m[0].length && 0 == n[0].length) {
@@ -1497,16 +1503,16 @@ goog.array.zip = function(a) {
   if (!arguments.length) {
     return [];
   }
-  for (var b = [], c = 0;;c++) {
-    for (var d = [], e = 0;e < arguments.length;e++) {
-      var f = arguments[e];
-      if (c >= f.length) {
-        return b;
-      }
-      d.push(f[c]);
+  for (var b = [], c = arguments[0].length, d = 1;d < arguments.length;d++) {
+    arguments[d].length < c && (c = arguments[d].length);
+  }
+  for (d = 0;d < c;d++) {
+    for (var e = [], f = 0;f < arguments.length;f++) {
+      e.push(arguments[f][d]);
     }
-    b.push(d);
+    b.push(e);
   }
+  return b;
 };
 goog.array.shuffle = function(a, b) {
   for (var c = b || Math.random, d = a.length - 1;0 < d;d--) {
@@ -1598,7 +1604,7 @@ goog.object.getValueByKeys = function(a, b) {
   return a;
 };
 goog.object.containsKey = function(a, b) {
-  return b in a;
+  return null !== a && b in a;
 };
 goog.object.containsValue = function(a, b) {
   for (var c in a) {
@@ -1635,13 +1641,13 @@ goog.object.remove = function(a, b) {
   return c;
 };
 goog.object.add = function(a, b, c) {
-  if (b in a) {
+  if (null !== a && b in a) {
     throw Error('The object already contains the key "' + b + '"');
   }
   goog.object.set(a, b, c);
 };
 goog.object.get = function(a, b, c) {
-  return b in a ? a[b] : c;
+  return null !== a && b in a ? a[b] : c;
 };
 goog.object.set = function(a, b, c) {
   a[b] = c;
@@ -1742,10 +1748,10 @@ goog.object.isImmutableView = function(a) {
 };
 goog.structs = {};
 goog.structs.getCount = function(a) {
-  return "function" == typeof a.getCount ? a.getCount() : goog.isArrayLike(a) || goog.isString(a) ? a.length : goog.object.getCount(a);
+  return a.getCount && "function" == typeof a.getCount ? a.getCount() : goog.isArrayLike(a) || goog.isString(a) ? a.length : goog.object.getCount(a);
 };
 goog.structs.getValues = function(a) {
-  if ("function" == typeof a.getValues) {
+  if (a.getValues && "function" == typeof a.getValues) {
     return a.getValues();
   }
   if (goog.isString(a)) {
@@ -1760,10 +1766,10 @@ goog.structs.getValues = function(a) {
   return goog.object.getValues(a);
 };
 goog.structs.getKeys = function(a) {
-  if ("function" == typeof a.getKeys) {
+  if (a.getKeys && "function" == typeof a.getKeys) {
     return a.getKeys();
   }
-  if ("function" != typeof a.getValues) {
+  if (!a.getValues || "function" != typeof a.getValues) {
     if (goog.isArrayLike(a) || goog.isString(a)) {
       var b = [];
       a = a.length;
@@ -1776,16 +1782,16 @@ goog.structs.getKeys = function(a) {
   }
 };
 goog.structs.contains = function(a, b) {
-  return "function" == typeof a.contains ? a.contains(b) : "function" == typeof a.containsValue ? a.containsValue(b) : goog.isArrayLike(a) || goog.isString(a) ? goog.array.contains(a, b) : goog.object.containsValue(a, b);
+  return a.contains && "function" == typeof a.contains ? a.contains(b) : a.containsValue && "function" == typeof a.containsValue ? a.containsValue(b) : goog.isArrayLike(a) || goog.isString(a) ? goog.array.contains(a, b) : goog.object.containsValue(a, b);
 };
 goog.structs.isEmpty = function(a) {
-  return "function" == typeof a.isEmpty ? a.isEmpty() : goog.isArrayLike(a) || goog.isString(a) ? goog.array.isEmpty(a) : goog.object.isEmpty(a);
+  return a.isEmpty && "function" == typeof a.isEmpty ? a.isEmpty() : goog.isArrayLike(a) || goog.isString(a) ? goog.array.isEmpty(a) : goog.object.isEmpty(a);
 };
 goog.structs.clear = function(a) {
-  "function" == typeof a.clear ? a.clear() : goog.isArrayLike(a) ? goog.array.clear(a) : goog.object.clear(a);
+  a.clear && "function" == typeof a.clear ? a.clear() : goog.isArrayLike(a) ? goog.array.clear(a) : goog.object.clear(a);
 };
 goog.structs.forEach = function(a, b, c) {
-  if ("function" == typeof a.forEach) {
+  if (a.forEach && "function" == typeof a.forEach) {
     a.forEach(b, c);
   } else {
     if (goog.isArrayLike(a) || goog.isString(a)) {
@@ -1985,19 +1991,26 @@ goog.functions.once = function(a) {
 goog.functions.debounce = function(a, b, c) {
   c && (a = goog.bind(a, c));
   var d = null;
-  return function() {
+  return function(c) {
     goog.global.clearTimeout(d);
-    d = goog.global.setTimeout(a, b);
+    var f = arguments;
+    d = goog.global.setTimeout(function() {
+      a.apply(null, f);
+    }, b);
   };
 };
 goog.functions.throttle = function(a, b, c) {
   c && (a = goog.bind(a, c));
-  var d = null, e = !1, f = function() {
+  var d = null, e = !1, f = [], g = function() {
     d = null;
-    e && (e = !1, d = goog.global.setTimeout(f, b), a());
+    e && (e = !1, h());
+  }, h = function() {
+    d = goog.global.setTimeout(g, b);
+    a.apply(null, f);
   };
-  return function() {
-    d ? e = !0 : (d = goog.global.setTimeout(f, b), a());
+  return function(a) {
+    f = arguments;
+    d ? e = !0 : h();
   };
 };
 goog.math = {};
@@ -2105,7 +2118,7 @@ goog.math.isNegativeZero = function(a) {
 goog.math.log10Floor = function(a) {
   if (0 < a) {
     var b = Math.round(Math.log(a) * Math.LOG10E);
-    return b - (parseFloat("1e" + b) > a);
+    return b - (parseFloat("1e" + b) > a ? 1 : 0);
   }
   return 0 == a ? -Infinity : NaN;
 };
@@ -2166,9 +2179,9 @@ goog.iter.forEach = function(a, b, c) {
       for (;;) {
         b.call(c, a.next(), void 0, a);
       }
-    } catch (d) {
-      if (d !== goog.iter.StopIteration) {
-        throw d;
+    } catch (e) {
+      if (e !== goog.iter.StopIteration) {
+        throw e;
       }
     }
   }
@@ -4087,7 +4100,7 @@ goog.labs.userAgent.util.matchUserAgentIgnoreCase = function(a) {
   return goog.string.caseInsensitiveContains(b, a);
 };
 goog.labs.userAgent.util.extractVersionTuples = function(a) {
-  for (var b = RegExp("(\\w[\\w ]+)/([^\\s]+)\\s*(?:\\((.*?)\\))?", "g"), c = [], d;d = b.exec(a);) {
+  for (var b = /(\w[\w ]+)\/([^\s]+)\s*(?:\((.*?)\))?/g, c = [], d;d = b.exec(a);) {
     c.push([d[1], d[2], d[3] || void 0]);
   }
   return c;
@@ -4489,7 +4502,7 @@ goog.debug.normalizeErrorObject = function(a) {
   }
   try {
     d = a.fileName || a.filename || a.sourceURL || goog.global.$googDebugFname || b;
-  } catch (f) {
+  } catch (g) {
     d = "Not available", e = !0;
   }
   return !e && a.lineNumber && a.fileName && a.stack && a.message && a.name ? a : {message:a.message || "Not available", name:a.name || "UnknownError", lineNumber:c, fileName:d, stack:a.stack || "Not available"};
@@ -6824,9 +6837,10 @@ goog.userAgent.product.ASSUME_IPAD = !1;
 goog.userAgent.product.ASSUME_ANDROID = !1;
 goog.userAgent.product.ASSUME_CHROME = !1;
 goog.userAgent.product.ASSUME_SAFARI = !0;
-goog.userAgent.product.PRODUCT_KNOWN_ = goog.userAgent.ASSUME_IE || goog.userAgent.ASSUME_OPERA || goog.userAgent.product.ASSUME_FIREFOX || goog.userAgent.product.ASSUME_IPHONE || goog.userAgent.product.ASSUME_IPAD || goog.userAgent.product.ASSUME_ANDROID || goog.userAgent.product.ASSUME_CHROME || goog.userAgent.product.ASSUME_SAFARI;
+goog.userAgent.product.PRODUCT_KNOWN_ = goog.userAgent.ASSUME_IE || goog.userAgent.ASSUME_EDGE || goog.userAgent.ASSUME_OPERA || goog.userAgent.product.ASSUME_FIREFOX || goog.userAgent.product.ASSUME_IPHONE || goog.userAgent.product.ASSUME_IPAD || goog.userAgent.product.ASSUME_ANDROID || goog.userAgent.product.ASSUME_CHROME || goog.userAgent.product.ASSUME_SAFARI;
 goog.userAgent.product.OPERA = goog.userAgent.OPERA;
 goog.userAgent.product.IE = goog.userAgent.IE;
+goog.userAgent.product.EDGE = goog.userAgent.EDGE;
 goog.userAgent.product.FIREFOX = goog.userAgent.product.PRODUCT_KNOWN_ ? goog.userAgent.product.ASSUME_FIREFOX : goog.labs.userAgent.browser.isFirefox();
 goog.userAgent.product.isIphoneOrIpod_ = function() {
   return goog.labs.userAgent.platform.isIphone() || goog.labs.userAgent.platform.isIpod();
@@ -6843,7 +6857,7 @@ goog.userAgent.product.determineVersion_ = function() {
   if (goog.userAgent.product.FIREFOX) {
     return goog.userAgent.product.getFirstRegExpGroup_(/Firefox\/([0-9.]+)/);
   }
-  if (goog.userAgent.product.IE || goog.userAgent.product.OPERA) {
+  if (goog.userAgent.product.IE || goog.userAgent.product.EDGE || goog.userAgent.product.OPERA) {
     return goog.userAgent.VERSION;
   }
   if (goog.userAgent.product.CHROME) {
@@ -6976,7 +6990,7 @@ goog.json.Serializer.prototype.serializeInternal = function(a, b) {
         this.serializeNumber_(a, b);
         break;
       case "boolean":
-        b.push(a);
+        b.push(String(a));
         break;
       case "function":
         b.push("null");
@@ -6996,7 +7010,7 @@ goog.json.Serializer.prototype.serializeString_ = function(a, b) {
   }), '"');
 };
 goog.json.Serializer.prototype.serializeNumber_ = function(a, b) {
-  b.push(isFinite(a) && !isNaN(a) ? a : "null");
+  b.push(isFinite(a) && !isNaN(a) ? String(a) : "null");
 };
 goog.json.Serializer.prototype.serializeArray = function(a, b) {
   var c = a.length;

data/lib/selenium/webdriver/safari/server.rb

@@ -22,13 +22,20 @@ module Selenium
     module Safari
 
       class Server
+        SOCKET_LOCK_TIMEOUT = 45
+
         def initialize(port, command_timeout)
-          @port  = port
+          @port = port
           @command_timeout = command_timeout
         end
 
         def start
-          @server = TCPServer.new(Platform.localhost, @port)
+          Platform.exit_hook { stop } # make sure we don't leave the server running
+
+          socket_lock.locked do
+            find_free_port
+            start_server
+          end
         end
 
         def stop
@@ -158,6 +165,20 @@ Server: safaridriver-ruby
           end
         end
 
+        private
+
+        def start_server
+          @server = TCPServer.new(Platform.localhost, @port)
+        end
+
+        def find_free_port
+          @port = PortProber.above @port
+        end
+
+        def socket_lock
+          @socket_lock ||= SocketLock.new(@port - 1, SOCKET_LOCK_TIMEOUT)
+        end
+
       end # Server
     end # Safari
   end # WebDriver