watir 6.7.2 → 6.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae158e5fbf5cef144dd15aec2a5901fe7706cbc8
-  data.tar.gz: f0f2ad99de5c0e581e1613d57cdcc5d1d5c346af
+  metadata.gz: 0b930f2cf34bcc0aad97aa3ea3e8fc13b17e3ecc
+  data.tar.gz: c499625ec63a5040ee9ad3d1fd37e2f4db5603c5
 SHA512:
-  metadata.gz: 8781d07465d978a372d2dcd53a6e1f281cf56643b22985d622858bf712c41e8e84dd7b08bdb9edde53589a7acb40e328dcee2a443189a2ac79ca4b40f6ff92f9
-  data.tar.gz: 35df9199ede87d9bb540b3f32279212e6b612d3d9a302cefb86859234a0c4c968fa5f2a21a194490aeadbd1a1c7518af66a6f946244da795c475fc77760184ff
+  metadata.gz: b1c18ce7ac92e2230145cd918590f659c0dd9d6b548962ba6345127bf7ab8a2784754145a0d39a6de9d9b67bcbcf869c27fbaad31a4444a3ab046f71d9f3e5e2
+  data.tar.gz: c263afc6af431c74738b73b290b8613a99417d7243cee861ca3f41b09e7f58d6c08532c7cf0ebef492845b1d51dfc64333a736c322e2835a3cc9b282439dbd32

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 6.7.3 (2017-08-20)
+
+* Fix bug preventing Capabilities from handling :driver_opts (#629)
+
 ### 6.7.2 (2017-08-18)
 
 * TableCell#column_header returns String not Cell

data/lib/watir/capabilities.rb

@@ -5,6 +5,7 @@ module Watir
 
     def initialize(browser, options = {})
       @options = options.dup
+      Watir.logger.info "Creating Browser instance of #{browser} with user provided options: #{@options.inspect}"
       @browser = if browser == :remote && @options.key?(:browser)
                    @options.delete(:browser)
                  elsif browser == :remote && @options.key?(:desired_capabilities)
@@ -18,21 +19,23 @@ module Watir
     end
 
     def to_args
-      [@selenium_browser, process_capabilities]
+      [@selenium_browser, process_arguments]
     end
 
     private
 
-    def process_capabilities
+    def process_arguments
       url = @options.delete(:url)
       @selenium_opts[:url] = url if url
 
       create_http_client
 
       @selenium_opts[:port] = @options.delete(:port) if @options.key?(:port)
+      @selenium_opts[:driver_opts] = @options.delete(:driver_opts) if @options.key?(:driver_opts)
 
       process_browser_options
-      process_caps
+      process_capabilities
+      Watir.logger.info "Creating Browser instance with Watir processed options: #{@selenium_opts.inspect}"
 
       @selenium_opts
     end
@@ -94,7 +97,7 @@ module Watir
       end
     end
 
-    def process_caps
+    def process_capabilities
       caps = @options.delete(:desired_capabilities)
 
       if caps

data/spec/browser_spec.rb

@@ -132,6 +132,26 @@ describe Watir::Browser do
         end
       end
 
+      compliant_on :chrome do
+        it "takes port and driver_opt as arguments" do
+          @original = WatirSpec.implementation.clone
+          browser.close
+          @opts = WatirSpec.implementation.browser_args.last
+
+          @opts.merge!(port: '2314', driver_opts: {args: ['foo']})
+
+          @new_browser = WatirSpec.new_browser
+
+          service = @new_browser.wd.instance_variable_get("@service")
+          expect(service.instance_variable_get("@extra_args")).to eq ["foo"]
+          expect(service.instance_variable_get("@port")).to eq 2314
+
+          @new_browser.close
+          WatirSpec.implementation = @original.clone
+          $browser = WatirSpec.new_browser
+        end
+      end
+
       it "takes a driver instance as argument" do
         mock_driver = double(Selenium::WebDriver::Driver)
         expect(Selenium::WebDriver::Driver).to receive(:===).with(mock_driver).and_return(true)

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.7.2'
+  s.version     = '6.7.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alex Rodionov', 'Titus Fortner']
   s.email       = ['p0deje@gmail.com', 'titusfortner@gmail.com']
@@ -33,5 +33,5 @@ It facilitates the writing of automated tests by mimicing the behavior of a user
   s.add_development_dependency 'pry'
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'yard-doctest', '>= 0.1.8'
-  s.add_development_dependency 'webdrivers'
+  s.add_development_dependency 'webdrivers', '~> 2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.7.2
+  version: 6.7.3
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -175,16 +175,16 @@ dependencies:
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: |
   Watir stands for Web Application Testing In Ruby
   It facilitates the writing of automated tests by mimicing the behavior of a user interacting with a website.