selenium-webdriver 3.4.4 → 3.5.0

data/CHANGES

@@ -1,3 +1,19 @@
+3.5.0 (2017-08-10)
+==================
+
+Firefox:
+  * Firefox subprocess output is now only redirected when debug is set (issue #4311)
+  * Fixed a bug where non-integers could be sent when setting window rect
+  * Fixed Firefox location detection on Windows_x64 (thanks kamenlitchev)
+  * Fixed passing of profile with a W3C compatible remote end
+
+IE:
+  * Added new IE::Options class that should be used to customize browser
+    behavior (native events, element scroll behavior, etc).
+    The instance of options class can be passed to driver initialization using
+    :options key. Old way of passing these customization directly to driver
+    initialization is deprecated.
+
 3.4.4 (2017-07-13)
 ==================
 

data/lib/selenium/webdriver/atoms/getAttribute.js

@@ -1,11 +1,8 @@
-function(){return function(){var aa="function"==typeof Object.defineProperties?Object.defineProperty:function(a,c,b){if(b.get||b.set)throw new TypeError("ES3 does not support getters and setters.");a!=Array.prototype&&a!=Object.prototype&&(a[c]=b.value)},ba="undefined"!=typeof window&&window===this?this:"undefined"!=typeof global?global:this;
-function e(a,c){if(c){for(var b=ba,d=a.split("."),f=0;f<d.length-1;f++){var h=d[f];h in b||(b[h]={});b=b[h]}d=d[d.length-1];f=b[d];h=c(f);h!=f&&null!=h&&aa(b,d,{configurable:!0,writable:!0,value:h})}}
-e("String.prototype.repeat",function(a){return a?a:function(a){var b;if(null==this)throw new TypeError("The 'this' value for String.prototype.repeat must not be null or undefined");b=this+"";if(0>a||1342177279<a)throw new RangeError("Invalid count value");a|=0;for(var d="";a;)if(a&1&&(d+=b),a>>>=1)b+=b;return d}});e("Math.sign",function(a){return a?a:function(a){a=Number(a);return!a||isNaN(a)?a:0<a?1:-1}});var g=this;function l(a){return"string"==typeof a};function m(a,c){this.a=n[a]||p;this.message=c||"";var b=this.a.replace(/((?:^|\s+)[a-z])/g,function(a){return a.toUpperCase().replace(/^[\s\xa0]+/g,"")}),d=b.length-5;if(0>d||b.indexOf("Error",d)!=d)b+="Error";this.name=b;b=Error(this.message);b.name=this.name;this.stack=b.stack||""}
-(function(){var a=Error;function c(){}c.prototype=a.prototype;m.b=a.prototype;m.prototype=new c;m.prototype.constructor=m;m.a=function(b,c,f){for(var h=Array(arguments.length-2),k=2;k<arguments.length;k++)h[k-2]=arguments[k];return a.prototype[c].apply(b,h)}})();var p="unknown error",n={15:"element not selectable",11:"element not visible"};n[31]=p;n[30]=p;n[24]="invalid cookie domain";n[29]="invalid element coordinates";n[12]="invalid element state";n[32]="invalid selector";n[51]="invalid selector";
-n[52]="invalid selector";n[17]="javascript error";n[405]="unsupported operation";n[34]="move target out of bounds";n[27]="no such alert";n[7]="no such element";n[8]="no such frame";n[23]="no such window";n[28]="script timeout";n[33]="session not created";n[10]="stale element reference";n[21]="timeout";n[25]="unable to set cookie";n[26]="unexpected alert open";n[13]=p;n[9]="unknown command";m.prototype.toString=function(){return this.name+": "+this.message};var q=String.prototype.trim?function(a){return a.trim()}:function(a){return a.replace(/^[\s\xa0]+|[\s\xa0]+$/g,"")};
-function r(a,c){for(var b=0,d=q(String(a)).split("."),f=q(String(c)).split("."),h=Math.max(d.length,f.length),k=0;!b&&k<h;k++){var S=d[k]||"",ja=f[k]||"",ka=RegExp("(\\d*)(\\D*)","g"),la=RegExp("(\\d*)(\\D*)","g");do{var t=ka.exec(S)||["","",""],u=la.exec(ja)||["","",""];if(0==t[0].length&&0==u[0].length)break;b=v(0==t[1].length?0:parseInt(t[1],10),0==u[1].length?0:parseInt(u[1],10))||v(0==t[2].length,0==u[2].length)||v(t[2],u[2])}while(!b)}return b}function v(a,c){return a<c?-1:a>c?1:0};var w;a:{var x=g.navigator;if(x){var y=x.userAgent;if(y){w=y;break a}}w=""}function z(a){return-1!=w.indexOf(a)};function ca(a,c){for(var b=a.length,d=l(a)?a.split(""):a,f=0;f<b;f++)f in d&&c.call(void 0,d[f],f,a)};function A(){return z("iPhone")&&!z("iPod")&&!z("iPad")};function B(){return z("Opera")||z("OPR")}function C(){return(z("Chrome")||z("CriOS"))&&!B()&&!z("Edge")};var D=B(),E=z("Trident")||z("MSIE"),F=z("Edge"),G=z("Gecko")&&!(-1!=w.toLowerCase().indexOf("webkit")&&!z("Edge"))&&!(z("Trident")||z("MSIE"))&&!z("Edge"),da=-1!=w.toLowerCase().indexOf("webkit")&&!z("Edge");function ea(){var a=w;if(G)return/rv\:([^\);]+)(\)|;)/.exec(a);if(F)return/Edge\/([\d\.]+)/.exec(a);if(E)return/\b(?:MSIE|rv)[: ]([^\);]+)(\)|;)/.exec(a);if(da)return/WebKit\/(\S+)/.exec(a)}function H(){var a=g.document;return a?a.documentMode:void 0}
-var I=function(){if(D&&g.opera){var a;var c=g.opera.version;try{a=c()}catch(b){a=c}return a}a="";(c=ea())&&(a=c?c[1]:"");return E&&(c=H(),null!=c&&c>parseFloat(a))?String(c):a}(),J={},K=g.document,L=K&&E?H()||("CSS1Compat"==K.compatMode?parseInt(I,10):5):void 0;!G&&!E||E&&9<=Number(L)||G&&(J["1.9.1"]||(J["1.9.1"]=0<=r(I,"1.9.1")));E&&(J["9"]||(J["9"]=0<=r(I,"9")));var fa=z("Firefox"),ga=A()||z("iPod"),ha=z("iPad"),M=z("Android")&&!(C()||z("Firefox")||B()||z("Silk")),ia=C(),N=z("Safari")&&!(C()||z("Coast")||B()||z("Edge")||z("Silk")||z("Android"))&&!(A()||z("iPad")||z("iPod"));var ma={SCRIPT:1,STYLE:1,HEAD:1,IFRAME:1,OBJECT:1},na={IMG:" ",BR:"\n"};function oa(a,c,b){if(!(a.nodeName in ma))if(3==a.nodeType)b?c.push(String(a.nodeValue).replace(/(\r\n|\r|\n)/g,"")):c.push(a.nodeValue);else if(a.nodeName in na)c.push(na[a.nodeName]);else for(a=a.firstChild;a;)oa(a,c,b),a=a.nextSibling};function O(a){return(a=a.exec(w))?a[1]:""}var pa=function(){if(fa)return O(/Firefox\/([0-9.]+)/);if(E||F||D)return I;if(ia)return O(/Chrome\/([0-9.]+)/);if(N&&!(A()||z("iPad")||z("iPod")))return O(/Version\/([0-9.]+)/);if(ga||ha){var a=/Version\/(\S+).*Mobile\/(\S+)/.exec(w);if(a)return a[1]+"."+a[2]}else if(M)return(a=O(/Android\s+([0-9.]+)/))?a:O(/Version\/([0-9.]+)/);return""}();var qa;function P(a){ra?qa(a):M?r(sa,a):r(pa,a)}var ra=function(){if(!G)return!1;var a=g.Components;if(!a)return!1;try{if(!a.classes)return!1}catch(f){return!1}var c=a.classes,a=a.interfaces,b=c["@mozilla.org/xpcom/version-comparator;1"].getService(a.nsIVersionComparator),d=c["@mozilla.org/xre/app-info;1"].getService(a.nsIXULAppInfo).version;qa=function(a){b.compare(d,""+a)};return!0}(),Q;if(M){var ta=/Android\s+([0-9\.]+)/.exec(w);Q=ta?ta[1]:"0"}else Q="0";
-var sa=Q,ua=E&&!(8<=Number(L)),va=E&&!(9<=Number(L));M&&P(2.3);M&&P(4);N&&P(6);function R(a,c){c=c.toLowerCase();if("style"==c)return wa(a.style.cssText);if(ua&&"value"==c&&T(a,"INPUT"))return a.value;if(va&&!0===a[c])return String(a.getAttribute(c));var b=a.getAttributeNode(c);return b&&b.specified?b.value:null}var xa=/[;]+(?=(?:(?:[^"]*"){2})*[^"]*$)(?=(?:(?:[^']*'){2})*[^']*$)(?=(?:[^()]*\([^()]*\))*[^()]*$)/;
-function wa(a){var c=[];ca(a.split(xa),function(a){var d=a.indexOf(":");0<d&&(a=[a.slice(0,d),a.slice(d+1)],2==a.length&&c.push(a[0].toLowerCase(),":",a[1],";"))});c=c.join("");return c=";"==c.charAt(c.length-1)?c:c+";"}function U(a,c){var b;ua&&"value"==c&&T(a,"OPTION")&&null===R(a,"value")?(b=[],oa(a,b,!1),b=b.join("")):b=a[c];return b}function T(a,c){return!!a&&1==a.nodeType&&(!c||a.tagName.toUpperCase()==c)}
-function ya(a){return T(a,"OPTION")?!0:T(a,"INPUT")?(a=a.type.toLowerCase(),"checkbox"==a||"radio"==a):!1};var za={"class":"className",readonly:"readOnly"},V="async autofocus autoplay checked compact complete controls declare defaultchecked defaultselected defer disabled draggable ended formnovalidate hidden indeterminate iscontenteditable ismap itemscope loop multiple muted nohref noresize noshade novalidate nowrap open paused pubdate readonly required reversed scoped seamless seeking selected spellcheck truespeed willvalidate".split(" ");function Aa(a,c){var b=null,d=c.toLowerCase();if("style"==d)return(b=a.style)&&!l(b)&&(b=b.cssText),b;if(("selected"==d||"checked"==d)&&ya(a)){if(!ya(a))throw new m(15,"Element is not selectable");var b="selected",f=a.type&&a.type.toLowerCase();if("checkbox"==f||"radio"==f)b="checked";return U(a,b)?"true":null}var h=T(a,"A");if(T(a,"IMG")&&"src"==d||h&&"href"==d)return(b=R(a,d))&&(b=U(a,d)),b;if("spellcheck"==d){b=R(a,d);if(null!==b){if("false"==b.toLowerCase())return"false";if("true"==b.toLowerCase())return"true"}return U(a,
-d)+""}h=za[c]||c;a:if(l(V))d=l(d)&&1==d.length?V.indexOf(d,0):-1;else{for(var k=0;k<V.length;k++)if(k in V&&V[k]===d){d=k;break a}d=-1}if(0<=d)return(b=null!==R(a,c)||U(a,h))?"true":null;try{f=U(a,h)}catch(S){}(d=null==f)||(d=typeof f,d="object"==d&&null!=f||"function"==d);d?b=R(a,c):b=f;return null!=b?b.toString():null}var W=["_"],X=g;W[0]in X||!X.execScript||X.execScript("var "+W[0]);for(var Y;W.length&&(Y=W.shift());){var Z;if(Z=!W.length)Z=void 0!==Aa;Z?X[Y]=Aa:X[Y]?X=X[Y]:X=X[Y]={}};; return this._.apply(null,arguments);}.apply({navigator:typeof window!='undefined'?window.navigator:null,document:typeof window!='undefined'?window.document:null}, arguments);}
+function(){return function(){var d=this;function f(a){return"string"==typeof a};function h(a,b){this.code=a;this.a=l[a]||m;this.message=b||"";a=this.a.replace(/((?:^|\s+)[a-z])/g,function(a){return a.toUpperCase().replace(/^[\s\xa0]+/g,"")});b=a.length-5;if(0>b||a.indexOf("Error",b)!=b)a+="Error";this.name=a;a=Error(this.message);a.name=this.name;this.stack=a.stack||""}
+(function(){var a=Error;function b(){}b.prototype=a.prototype;h.b=a.prototype;h.prototype=new b;h.prototype.constructor=h;h.a=function(b,c,g){for(var e=Array(arguments.length-2),k=2;k<arguments.length;k++)e[k-2]=arguments[k];return a.prototype[c].apply(b,e)}})();var m="unknown error",l={15:"element not selectable",11:"element not visible"};l[31]=m;l[30]=m;l[24]="invalid cookie domain";l[29]="invalid element coordinates";l[12]="invalid element state";l[32]="invalid selector";l[51]="invalid selector";
+l[52]="invalid selector";l[17]="javascript error";l[405]="unsupported operation";l[34]="move target out of bounds";l[27]="no such alert";l[7]="no such element";l[8]="no such frame";l[23]="no such window";l[28]="script timeout";l[33]="session not created";l[10]="stale element reference";l[21]="timeout";l[25]="unable to set cookie";l[26]="unexpected alert open";l[13]=m;l[9]="unknown command";h.prototype.toString=function(){return this.name+": "+this.message};var n;a:{var p=d.navigator;if(p){var q=p.userAgent;if(q){n=q;break a}}n=""}function r(a){return-1!=n.indexOf(a)};function t(a,b){for(var e=a.length,c=f(a)?a.split(""):a,g=0;g<e;g++)g in c&&b.call(void 0,c[g],g,a)};function v(){return r("iPhone")&&!r("iPod")&&!r("iPad")};function w(){return(r("Chrome")||r("CriOS"))&&!r("Edge")};var x=r("Opera"),y=r("Trident")||r("MSIE"),z=r("Edge"),A=r("Gecko")&&!(-1!=n.toLowerCase().indexOf("webkit")&&!r("Edge"))&&!(r("Trident")||r("MSIE"))&&!r("Edge"),aa=-1!=n.toLowerCase().indexOf("webkit")&&!r("Edge");function B(){var a=d.document;return a?a.documentMode:void 0}var C;
+a:{var D="",E=function(){var a=n;if(A)return/rv\:([^\);]+)(\)|;)/.exec(a);if(z)return/Edge\/([\d\.]+)/.exec(a);if(y)return/\b(?:MSIE|rv)[: ]([^\);]+)(\)|;)/.exec(a);if(aa)return/WebKit\/(\S+)/.exec(a);if(x)return/(?:Version)[ \/]?(\S+)/.exec(a)}();E&&(D=E?E[1]:"");if(y){var F=B();if(null!=F&&F>parseFloat(D)){C=String(F);break a}}C=D}var G;var H=d.document;G=H&&y?B()||("CSS1Compat"==H.compatMode?parseInt(C,10):5):void 0;var ba=r("Firefox"),ca=v()||r("iPod"),da=r("iPad"),I=r("Android")&&!(w()||r("Firefox")||r("Opera")||r("Silk")),ea=w(),J=r("Safari")&&!(w()||r("Coast")||r("Opera")||r("Edge")||r("Silk")||r("Android"))&&!(v()||r("iPad")||r("iPod"));function K(a){return(a=a.exec(n))?a[1]:""}(function(){if(ba)return K(/Firefox\/([0-9.]+)/);if(y||z||x)return C;if(ea)return v()||r("iPad")||r("iPod")?K(/CriOS\/([0-9.]+)/):K(/Chrome\/([0-9.]+)/);if(J&&!(v()||r("iPad")||r("iPod")))return K(/Version\/([0-9.]+)/);if(ca||da){var a=/Version\/(\S+).*Mobile\/(\S+)/.exec(n);if(a)return a[1]+"."+a[2]}else if(I)return(a=K(/Android\s+([0-9.]+)/))?a:K(/Version\/([0-9.]+)/);return""})();var L,M=function(){if(!A)return!1;var a=d.Components;if(!a)return!1;try{if(!a.classes)return!1}catch(g){return!1}var b=a.classes,a=a.interfaces,e=b["@mozilla.org/xpcom/version-comparator;1"].getService(a.nsIVersionComparator),c=b["@mozilla.org/xre/app-info;1"].getService(a.nsIXULAppInfo).version;L=function(a){e.compare(c,""+a)};return!0}(),N=y&&!(8<=Number(G)),fa=y&&!(9<=Number(G));I&&M&&L(2.3);I&&M&&L(4);J&&M&&L(6);var ga={SCRIPT:1,STYLE:1,HEAD:1,IFRAME:1,OBJECT:1},O={IMG:" ",BR:"\n"};function P(a,b,e){if(!(a.nodeName in ga))if(3==a.nodeType)e?b.push(String(a.nodeValue).replace(/(\r\n|\r|\n)/g,"")):b.push(a.nodeValue);else if(a.nodeName in O)b.push(O[a.nodeName]);else for(a=a.firstChild;a;)P(a,b,e),a=a.nextSibling};function Q(a,b){b=b.toLowerCase();return"style"==b?ha(a.style.cssText):N&&"value"==b&&R(a,"INPUT")?a.value:fa&&!0===a[b]?String(a.getAttribute(b)):(a=a.getAttributeNode(b))&&a.specified?a.value:null}var ia=/[;]+(?=(?:(?:[^"]*"){2})*[^"]*$)(?=(?:(?:[^']*'){2})*[^']*$)(?=(?:[^()]*\([^()]*\))*[^()]*$)/;
+function ha(a){var b=[];t(a.split(ia),function(a){var c=a.indexOf(":");0<c&&(a=[a.slice(0,c),a.slice(c+1)],2==a.length&&b.push(a[0].toLowerCase(),":",a[1],";"))});b=b.join("");return b=";"==b.charAt(b.length-1)?b:b+";"}function S(a,b){N&&"value"==b&&R(a,"OPTION")&&null===Q(a,"value")?(b=[],P(a,b,!1),a=b.join("")):a=a[b];return a}function R(a,b){b&&"string"!==typeof b&&(b=b.toString());return!!a&&1==a.nodeType&&(!b||a.tagName.toUpperCase()==b)}
+function T(a){return R(a,"OPTION")?!0:R(a,"INPUT")?(a=a.type.toLowerCase(),"checkbox"==a||"radio"==a):!1};var ja={"class":"className",readonly:"readOnly"},U="async autofocus autoplay checked compact complete controls declare defaultchecked defaultselected defer disabled draggable ended formnovalidate hidden indeterminate iscontenteditable ismap itemscope loop multiple muted nohref noresize noshade novalidate nowrap open paused pubdate readonly required reversed scoped seamless seeking selected spellcheck truespeed willvalidate".split(" ");function V(a,b){var e=null,c=b.toLowerCase();if("style"==c)return(e=a.style)&&!f(e)&&(e=e.cssText),e;if(("selected"==c||"checked"==c)&&T(a)){if(!T(a))throw new h(15,"Element is not selectable");b="selected";e=a.type&&a.type.toLowerCase();if("checkbox"==e||"radio"==e)b="checked";return S(a,b)?"true":null}var g=R(a,"A");if(R(a,"IMG")&&"src"==c||g&&"href"==c)return(e=Q(a,c))&&(e=S(a,c)),e;if("spellcheck"==c){e=Q(a,c);if(null!==e){if("false"==e.toLowerCase())return"false";if("true"==e.toLowerCase())return"true"}return S(a,
+c)+""}g=ja[b]||b;a:if(f(U))c=f(c)&&1==c.length?U.indexOf(c,0):-1;else{for(var u=0;u<U.length;u++)if(u in U&&U[u]===c){c=u;break a}c=-1}if(0<=c)return(e=null!==Q(a,b)||S(a,g))?"true":null;try{var k=S(a,g)}catch(ka){}(c=null==k)||(c=typeof k,c="object"==c&&null!=k||"function"==c);c?e=Q(a,b):e=k;return null!=e?e.toString():null}var W=["_"],X=d;W[0]in X||!X.execScript||X.execScript("var "+W[0]);
+for(var Y;W.length&&(Y=W.shift());){var Z;if(Z=!W.length)Z=void 0!==V;Z?X[Y]=V:X[Y]&&X[Y]!==Object.prototype[Y]?X=X[Y]:X=X[Y]={}};; return this._.apply(null,arguments);}.apply({navigator:typeof window!='undefined'?window.navigator:null,document:typeof window!='undefined'?window.document:null}, arguments);}

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

@@ -81,7 +81,7 @@ module Selenium
         end
 
         #
-        # Add a command-line argument to use when starting Chrome
+        # Add a command-line argument to use when starting Chrome.
         #
         # @example Start Chrome maximized
         #   options = Selenium::WebDriver::Chrome::Options.new
@@ -164,7 +164,7 @@ module Selenium
           opts[:prefs] = @prefs unless @prefs.empty?
           opts
         end
-      end # Profile
+      end # Options
     end # Chrome
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/platform.rb

@@ -161,7 +161,8 @@ module Selenium
       def find_in_program_files(*binary_names)
         paths = [
           ENV['PROGRAMFILES'] || '\\Program Files',
-          ENV['ProgramFiles(x86)'] || '\\Program Files (x86)'
+          ENV['ProgramFiles(x86)'] || '\\Program Files (x86)',
+          ENV['ProgramW6432'] || '\\Program Files'
         ]
 
         paths.each do |root|

data/lib/selenium/webdriver/firefox/binary.rb

@@ -79,7 +79,7 @@ module Selenium
           @process = ChildProcess.build(*args)
           WebDriver.logger.debug("Executing Process #{args}")
 
-          @process.io.stdout = @process.io.stderr = WebDriver.logger.io
+          @process.io.stdout = @process.io.stderr = WebDriver.logger.io if WebDriver.logger.debug?
           @process.start
         end
 

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

@@ -133,7 +133,7 @@ module Selenium
 
           {KEY => opts}
         end
-      end # Profile
+      end # Options
     end # Firefox
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/ie.rb

@@ -18,6 +18,7 @@
 # under the License.
 
 require 'selenium/webdriver/ie/driver'
+require 'selenium/webdriver/ie/options'
 require 'selenium/webdriver/ie/service'
 
 module Selenium

data/lib/selenium/webdriver/ie/driver.rb

@@ -31,7 +31,7 @@ module Selenium
         include DriverExtensions::TakesScreenshot
 
         def initialize(opts = {})
-          opts[:desired_capabilities] ||= Remote::Capabilities.internet_explorer
+          opts[:desired_capabilities] = create_capabilities(opts)
 
           unless opts.key?(:url)
             driver_path = opts.delete(:driver_path) || IE.driver_path
@@ -54,11 +54,6 @@ module Selenium
             opts[:url] = @service.uri
           end
 
-          if opts.delete(:introduce_flakiness_by_ignoring_security_domains)
-            opts[:desired_capabilities][:ignore_protected_mode_settings] = true
-          end
-          opts[:desired_capabilities][:native_events] = opts.delete(:native_events) != false
-
           listener = opts.delete(:listener)
           @bridge = Remote::Bridge.handshake(opts)
           super(@bridge, listener: listener)
@@ -74,6 +69,34 @@ module Selenium
           @service.stop if @service
         end
 
+        private
+
+        def create_capabilities(opts)
+          caps = opts.delete(:desired_capabilities) { Remote::Capabilities.internet_explorer }
+          options = opts.delete(:options) { Options.new }
+
+          if opts.delete(:introduce_flakiness_by_ignoring_security_domains)
+            WebDriver.logger.deprecate ':introduce_flakiness_by_ignoring_security_domains',
+                                       'Selenium::WebDriver::IE::Options#ignore_protected_mode_settings='
+            options.ignore_protected_mode_settings = true
+          end
+
+          native_events = opts.delete(:native_events)
+          unless native_events.nil?
+            WebDriver.logger.deprecate ':native_events', 'Selenium::WebDriver::IE::Options#native_events='
+            options.native_events = native_events
+          end
+
+          # Backward compatibility with older IEDriverServer versions
+          caps[:ignore_protected_mode_settings] = options.ignore_protected_mode_settings
+          caps[:native_events] = options.native_events
+
+          options = options.as_json
+          caps.merge!(options) unless options.empty?
+
+          caps
+        end
+
       end # Driver
     end # IE
   end # WebDriver

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

@@ -0,0 +1,138 @@
+# encoding: utf-8
+#
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    module IE
+      class Options
+        KEY = 'se:ieOptions'.freeze
+        SCROLL_TOP = 0
+        SCROLL_BOTTOM = 1
+        CAPABILITIES = {
+          browser_attach_timeout: 'browserAttachTimeout',
+          element_scroll_behavior: 'elementScrollBehavior',
+          full_page_screenshot: 'ie.enableFullPageScreenshot',
+          ensure_clean_session: 'ie.ensureCleanSession',
+          file_upload_dialog_timeout: 'ie.fileUploadDialogTimeout',
+          force_create_process_api: 'ie.forceCreateProcessApi',
+          force_shell_windows_api: 'ie.forceShellWindowsApi',
+          ignore_protected_mode_settings: 'ignoreProtectedModeSettings',
+          ignore_zoom_level: 'ignoreZoomSetting',
+          initial_browser_url: 'initialBrowserUrl',
+          native_events: 'nativeEvents',
+          persistent_hover: 'enablePersistentHover',
+          require_window_focus: 'requireWindowFocus',
+          use_per_process_proxy: 'ie.usePerProcessProxy',
+          validate_cookie_document_type: 'ie.validateCookieDocumentType'
+        }.freeze
+
+        CAPABILITIES.keys.each do |key|
+          define_method key do
+            @options[key]
+          end
+
+          define_method "#{key}=" do |value|
+            @options[key] = value
+          end
+        end
+
+        attr_reader :args, :options
+
+        #
+        # Create a new Options instance
+        #
+        # @example
+        #   options = Selenium::WebDriver::IE::Options.new(args: ['--host=127.0.0.1'])
+        #   driver = Selenium::WebDriver.for(:ie, options: options)
+        #
+        # @example
+        #   options = Selenium::WebDriver::IE::Options.new
+        #   options.element_scroll_behavior = Selenium::WebDriver::IE::Options::SCROLL_BOTTOM
+        #   driver = Selenium::WebDriver.for(:ie, options: options)
+        #
+        # @param [Hash] options the pre-defined options
+        # @option options [Array<String>] args
+        # @option options [Integer] browser_attach_timeout
+        # @option options [Integer] element_scroll_behavior Either SCROLL_TOP or SCROLL_BOTTOM
+        # @option options [Boolean] full_page_screenshot
+        # @option options [Boolean] ensure_clean_session
+        # @option options [Integer] file_upload_dialog_timeout
+        # @option options [Boolean] force_create_process_api
+        # @option options [Boolean] force_shell_windows_api
+        # @option options [Boolean] ignore_protected_mode_settings
+        # @option options [Boolean] ignore_zoom_level
+        # @option options [String] initial_browser_url
+        # @option options [Boolean] native_events
+        # @option options [Boolean] persistent_hover
+        # @option options [Boolean] require_window_focus
+        # @option options [Boolean] use_per_process_proxy
+        # @option options [Boolean] validate_cookie_document_type
+        #
+
+        def initialize(**opts)
+          @args = opts.delete(:args) || []
+          @options = opts
+          @options[:native_events] ||= true
+        end
+
+        #
+        # Add a command-line argument to use when starting Internet Explorer.
+        #
+        # @param [String] arg The command-line argument to add
+        #
+
+        def add_argument(arg)
+          @args << arg
+        end
+
+        #
+        # Add a new option not yet handled by these bindings.
+        #
+        # @example
+        #   options = Selenium::WebDriver::IE::Options.new
+        #   options.add_option(:foo, 'bar')
+        #
+        # @param [String, Symbol] name Name of the option
+        # @param [Boolean, String, Integer] value Value of the option
+        #
+
+        def add_option(name, value)
+          @options[name] = value
+        end
+
+        #
+        # @api private
+        #
+
+        def as_json(*)
+          opts = {}
+
+          CAPABILITIES.each do |capability_alias, capability_name|
+            capability_value = @options.delete(capability_alias)
+            opts[capability_name] = capability_value unless capability_value.nil?
+          end
+          opts['ie.browserCommandLineSwitches'] = @args.join(' ') if @args.any?
+          opts.merge!(@options)
+
+          {KEY => opts}
+        end
+      end # Options
+    end # IE
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/remote/w3c/bridge.rb

@@ -167,7 +167,7 @@ module Selenium
             unless handle == :current
               raise Error::WebDriverError, 'Switch to desired window before changing its size'
             end
-            execute :set_window_rect, {}, {width: width, height: height}
+            set_window_rect(width: width, height: height)
           end
 
           def window_size(handle = :current)
@@ -195,7 +195,7 @@ module Selenium
           end
 
           def reposition_window(x, y)
-            execute :set_window_rect, {}, {x: x, y: y}
+            set_window_rect(x: x, y: y)
           end
 
           def window_position
@@ -204,7 +204,9 @@ module Selenium
           end
 
           def set_window_rect(x: nil, y: nil, width: nil, height: nil)
-            execute :set_window_rect, {}, {x: x, y: y, width: width, height: height}
+            params = {x: x, y: y, width: width, height: height}
+            params.update(params) { |k, v| Integer(v) unless v.nil? }
+            execute :set_window_rect, {}, params
           end
 
           def window_rect

data/lib/selenium/webdriver/remote/w3c/capabilities.rb

@@ -142,7 +142,7 @@ module Selenium
 
             #
             # Creates W3C compliant capabilities from OSS ones.
-            # @param [Hash, Remote::Capabilities]
+            # @param oss_capabilities [Hash, Remote::Capabilities]
             #
 
             def from_oss(oss_capabilities)
@@ -156,11 +156,6 @@ module Selenium
 
                 capability_name = name.to_s
 
-                if capability_name == 'firefox_options'
-                  msg = ':firefox_options is no longer a valid parameter for Remote::Capabilities, use Firefox::Options instead'
-                  raise Error::WebDriverError msg
-                end
-
                 snake_cased_capability_names = KNOWN.map(&:to_s)
                 camel_cased_capability_names = snake_cased_capability_names.map(&w3c_capabilities.method(:camel_case))
 
@@ -171,6 +166,27 @@ module Selenium
                 w3c_capabilities[name] = value
               end
 
+              # User can pass :firefox_options or :firefox_profile.
+              #
+              # TODO (alex): Refactor this whole method into converter class.
+              firefox_options = oss_capabilities['firefoxOptions'] || oss_capabilities['firefox_options'] || oss_capabilities[:firefox_options]
+              firefox_profile = oss_capabilities['firefox_profile'] || oss_capabilities[:firefox_profile]
+              firefox_binary  = oss_capabilities['firefox_binary'] || oss_capabilities[:firefox_binary]
+
+              if firefox_profile && firefox_options
+                second_profile = firefox_options['profile'] || firefox_options[:profile]
+                if second_profile && firefox_profile != second_profile
+                  raise Error::WebDriverError, 'You cannot pass 2 different Firefox profiles'
+                end
+              end
+
+              if firefox_options || firefox_profile || firefox_binary
+                options = WebDriver::Firefox::Options.new(firefox_options || {})
+                options.binary = firefox_binary if firefox_binary
+                options.profile = firefox_profile if firefox_profile
+                w3c_capabilities.merge!(options.as_json)
+              end
+
               w3c_capabilities
             end
           end
@@ -181,7 +197,7 @@ module Selenium
           # @option :browser_version          [String] required browser version number
           # @option :platform_name            [Symbol] one of :any, :win, :mac, or :x
           # @option :platform_version         [String] required platform version number
-          # @option :accept_insecure_certs    [Boolean] does the driver accept SSL Cerfifications?
+          # @option :accept_insecure_certs    [Boolean] does the driver accept insecure SSL certifications?
           # @option :proxy                    [Selenium::WebDriver::Proxy, Hash] proxy configuration
           #
           # @api public

data/selenium-webdriver.gemspec

@@ -5,7 +5,7 @@ raise "cwd must be #{root} when reading gemspec" if root != Dir.pwd
 
 Gem::Specification.new do |s|
   s.name = 'selenium-webdriver'
-  s.version = '3.4.4'
+  s.version = '3.5.0'
 
   s.authors = ['Alex Rodionov', 'Titus Fortner']
   s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com']
@@ -28,5 +28,5 @@ HTML of the application.'
   s.add_development_dependency 'rspec', ['~> 3.0']
   s.add_development_dependency 'rack', ['~> 1.0']
   s.add_development_dependency 'webmock', ['~> 2.0']
-  s.add_development_dependency 'yard', ['~> 0.8.7']
+  s.add_development_dependency 'yard', ['~> 0.9.9']
 end

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.4.4
+  version: 3.5.0
 platform: ruby
 authors: 
   - Alex Rodionov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2017-07-13 00:00:00 +07:00
+date: 2017-08-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -77,7 +77,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 0.8.7
+            version: 0.9.9
     type: :development
     version_requirements: *id006
 description: |-
@@ -96,7 +96,6 @@ extra_rdoc_files: []
 files: 
   - CHANGES
   - Gemfile
-  - Gemfile.lock
   - LICENSE
   - README.md
   - selenium-webdriver.gemspec
@@ -192,6 +191,7 @@ files:
   - lib/selenium/webdriver/firefox/native/linux/amd64/x_ignore_nofocus.so
   - lib/selenium/webdriver/firefox/native/linux/x86/x_ignore_nofocus.so
   - lib/selenium/webdriver/ie/driver.rb
+  - lib/selenium/webdriver/ie/options.rb
   - lib/selenium/webdriver/ie/service.rb
   - lib/selenium/webdriver/phantomjs/driver.rb
   - lib/selenium/webdriver/phantomjs/service.rb

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    selenium-webdriver (3.4.3)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    childprocess (0.7.0)
-      ffi (~> 1.0, >= 1.0.11)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    ffi (1.9.18)
-    hashdiff (0.3.4)
-    public_suffix (2.0.5)
-    rack (1.6.8)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubyzip (1.2.1)
-    safe_yaml (1.0.4)
-    webmock (2.3.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rack (~> 1.0)
-  rspec (~> 3.0)
-  selenium-webdriver!
-  webmock (~> 2.0)
-  yard (~> 0.8.7)
-
-BUNDLED WITH
-   1.15.1