watir 7.1.0 → 7.2.0

data/spec/unit/capabilities_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'unit_helper'
 
 describe Watir::Capabilities do
@@ -49,25 +51,35 @@ describe Watir::Capabilities do
 
       args = capabilities.to_args
       expect(args.last[:http_client]).to be_a Watir::HttpClient
-      expect(args.last[:capabilities].first).to be_a options_class(browser_symbol)
+      expect(args.last[:options]).to be_a options_class(browser_symbol)
       expect(args.last).not_to include(:service)
     end
 
+    it 'errors with url and service' do
+      expect {
+        Watir::Capabilities.new(browser_symbol,
+                                service: instance_double(Selenium::WebDriver::Service),
+                                url: 'https://example.com/wd/hub/')
+      }.to raise_exception(ArgumentError, ':url and :service are not both allowed')
+    end
+
     it 'just options has client & options but not capabilities or service' do
       capabilities = Watir::Capabilities.new(options: options_class(browser_symbol).new)
 
       args = capabilities.to_args
 
       expect(args.last[:http_client]).to be_a Watir::HttpClient
-      expect(args.last[:capabilities].first).to be_a options_class(browser_symbol)
+      expect(args.last[:options]).to be_a options_class(browser_symbol)
       expect(args.last).not_to include(:service)
     end
 
     it 'just capabilities has client & capabilities but not service' do
       caps = Selenium::WebDriver::Remote::Capabilities.send(browser_symbol)
       capabilities = Watir::Capabilities.new(capabilities: caps)
-
-      args = capabilities.to_args
+      args = []
+      expect {
+        args = capabilities.to_args
+      }.to have_deprecated(:capabilities)
 
       expect(args.last[:http_client]).to be_a Watir::HttpClient
       expect(args.last[:capabilities]).to be_a(Selenium::WebDriver::Remote::Capabilities)
@@ -84,7 +96,7 @@ describe Watir::Capabilities do
         args = capabilities.to_args
         expect(args.first).to eq browser_symbol
         actual_service = args.last[:service]
-        expect(actual_service.instance_variable_get('@port')).to eq 1234
+        expect(actual_service.instance_variable_get(:@port)).to eq 1234
       end
 
       it 'builds service from a Hash' do
@@ -95,9 +107,9 @@ describe Watir::Capabilities do
         args = capabilities.to_args
         expect(args.first).to eq browser_symbol
         actual_service = args.last[:service]
-        expect(actual_service.instance_variable_get('@port')).to eq 1234
-        expect(actual_service.instance_variable_get('@executable_path')).to eq '/path/to/driver'
-        expect(actual_service.instance_variable_get('@extra_args')).to include '--foo', '--bar'
+        expect(actual_service.instance_variable_get(:@port)).to eq 1234
+        expect(actual_service.instance_variable_get(:@executable_path)).to eq '/path/to/driver'
+        expect(actual_service.instance_variable_get(:@extra_args)).to include '--foo', '--bar'
       end
 
       it 'is a bad argument to service' do
@@ -127,8 +139,8 @@ describe Watir::Capabilities do
         args = capabilities.to_args
         actual_client = args.last[:http_client]
         expect(actual_client).to be_a Watir::HttpClient
-        expect(actual_client.instance_variable_get('@read_timeout')).to eq 10
-        expect(actual_client.instance_variable_get('@open_timeout')).to eq 10
+        expect(actual_client.instance_variable_get(:@read_timeout)).to eq 10
+        expect(actual_client.instance_variable_get(:@open_timeout)).to eq 10
       end
 
       it 'raises an exception if :client receives something other than Hash or Client object' do
@@ -160,7 +172,7 @@ describe Watir::Capabilities do
                    script_timeout: 12}
         capabilities = Watir::Capabilities.new(browser_symbol, options: options)
         args = capabilities.to_args
-        actual_options = args.last[:capabilities].first
+        actual_options = args.last[:options]
         expect(actual_options.timeouts[:page_load]).to eq 11_000
         expect(actual_options.timeouts[:script]).to eq 12_000
       end
@@ -168,10 +180,9 @@ describe Watir::Capabilities do
       it 'has deprecated timeouts key with page load warning' do
         options = {timeouts: {page_load: 11}}
         capabilities = Watir::Capabilities.new(browser_symbol, options: options)
-        msg = 'timeouts has been deprecated, use page_load_timeout (in seconds) directly instead'
         expect {
           capabilities.to_args
-        }.to have_deprecated_timeouts(msg)
+        }.to have_deprecated(:timeouts)
       end
 
       it 'has deprecated timeouts key with script warning' do
@@ -179,7 +190,7 @@ describe Watir::Capabilities do
         expect {
           capabilities = Watir::Capabilities.new(browser_symbol, options: options)
           capabilities.to_args
-        }.to have_deprecated_timeouts('timeouts has been deprecated, use script_timeout (in seconds) directly instead')
+        }.to have_deprecated(:timeouts)
       end
 
       it 'does not allow implicit wait timeout in timeouts hash' do
@@ -194,14 +205,14 @@ describe Watir::Capabilities do
     it 'unhandled prompt behavior defaults to ignore' do
       capabilities = Watir::Capabilities.new(browser_symbol)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.unhandled_prompt_behavior).to eq :ignore
     end
 
     it 'unhandled prompt behavior can be overridden' do
       capabilities = Watir::Capabilities.new(browser_symbol, options: {unhandled_prompt_behavior: :accept_and_notify})
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.unhandled_prompt_behavior).to eq :accept_and_notify
     end
 
@@ -210,7 +221,7 @@ describe Watir::Capabilities do
         proxy = Selenium::WebDriver::Proxy.new(http: '127.0.0.1:8080', ssl: '127.0.0.1:443')
         capabilities = Watir::Capabilities.new(browser_symbol, proxy: proxy)
         args = capabilities.to_args
-        proxy = args.last[:capabilities].first.proxy
+        proxy = args.last[:options].proxy
 
         expect(proxy).to be_a Selenium::WebDriver::Proxy
         expect(proxy.type).to eq(:manual)
@@ -222,7 +233,7 @@ describe Watir::Capabilities do
         proxy = {http: '127.0.0.1:8080', ssl: '127.0.0.1:443'}
         capabilities = Watir::Capabilities.new(browser_symbol, proxy: proxy)
         args = capabilities.to_args
-        proxy = args.last[:capabilities].first.proxy
+        proxy = args.last[:options].proxy
 
         expect(proxy).to be_a Selenium::WebDriver::Proxy
         expect(proxy.type).to eq(:manual)
@@ -237,7 +248,7 @@ describe Watir::Capabilities do
 
         capabilities = Watir::Capabilities.new(browser_symbol, options: options, proxy: proxy)
         args = capabilities.to_args
-        actual_options = args.last[:capabilities].first
+        actual_options = args.last[:options]
 
         expect(actual_options.proxy).to be_a Selenium::WebDriver::Proxy
         expect(actual_options.proxy.type).to eq(:manual)
@@ -277,7 +288,7 @@ describe Watir::Capabilities do
       capabilities = Watir::Capabilities.new(url: 'http://example.com')
       args = capabilities.to_args
       expect(args.first).to eq :remote
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.browser_name).to eq 'chrome'
     end
 
@@ -289,7 +300,7 @@ describe Watir::Capabilities do
       expect(args.last[:url]).to eq 'https://example.com/wd/hub/'
       expect(args.last[:http_client]).to be_a Watir::HttpClient
 
-      expect(args.last[:capabilities].first).to be_a Selenium::WebDriver::Firefox::Options
+      expect(args.last[:options]).to be_a Selenium::WebDriver::Firefox::Options
       expect(args.last).not_to include(:service)
     end
 
@@ -310,7 +321,7 @@ describe Watir::Capabilities do
       args = capabilities.to_args
       expect(args.first).to eq :remote
       expect(args.last[:http_client]).to eq client
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.browser_name).to eq 'chrome'
     end
 
@@ -320,8 +331,8 @@ describe Watir::Capabilities do
                                              http_client: {read_timeout: 30})
       args = capabilities.to_args
       expect(args.first).to eq :remote
-      expect(args.last[:http_client].instance_variable_get('@read_timeout')).to eq 30
-      actual_options = args.last[:capabilities].first
+      expect(args.last[:http_client].instance_variable_get(:@read_timeout)).to eq 30
+      actual_options = args.last[:options]
       expect(actual_options.browser_name).to eq 'chrome'
     end
 
@@ -332,7 +343,7 @@ describe Watir::Capabilities do
                                              proxy: proxy)
       args = capabilities.to_args
       expect(args.first).to eq :remote
-      proxy = args.last[:capabilities].first.proxy
+      proxy = args.last[:options].proxy
       expect(proxy).to be_a Selenium::WebDriver::Proxy
       expect(proxy.type).to eq(:manual)
       expect(proxy.http).to eq('127.0.0.1:8080')
@@ -346,7 +357,7 @@ describe Watir::Capabilities do
                                              proxy: proxy)
       args = capabilities.to_args
       expect(args.first).to eq :remote
-      proxy = args.last[:capabilities].first.proxy
+      proxy = args.last[:options].proxy
       expect(proxy).to be_a Selenium::WebDriver::Proxy
       expect(proxy.type).to eq(:manual)
       expect(proxy.http).to eq('127.0.0.1:8080')
@@ -359,7 +370,7 @@ describe Watir::Capabilities do
                                              options: Selenium::WebDriver::Chrome::Options.new(args: ['--foo']))
       args = capabilities.to_args
       expect(args.first).to eq :remote
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.browser_name).to eq 'chrome'
       expect(actual_options.args).to include('--foo')
     end
@@ -372,7 +383,7 @@ describe Watir::Capabilities do
       args = capabilities.to_args
       expect(args.first).to eq :remote
       expect(args.last[:url]).to eq 'http://example.com'
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options).to be_a(Selenium::WebDriver::Chrome::Options)
       expect(actual_options.prefs).to eq(foo: 'bar')
     end
@@ -381,7 +392,11 @@ describe Watir::Capabilities do
       caps = Watir::Capabilities.new(:chrome,
                                      url: 'https://example.com/wd/hub',
                                      capabilities: Selenium::WebDriver::Remote::Capabilities.chrome)
-      args = caps.to_args
+      args = []
+      expect {
+        args = caps.to_args
+      }.to have_deprecated(:capabilities)
+
       expect(args.first).to eq :remote
       actual_capabilities = args.last[:capabilities]
       expect(actual_capabilities).to be_a(Selenium::WebDriver::Remote::Capabilities)
@@ -394,8 +409,11 @@ describe Watir::Capabilities do
                                      url: 'https://example.com/wd/hub',
                                      capabilities: Selenium::WebDriver::Remote::Capabilities.chrome,
                                      http_client: client)
+      args = []
+      expect {
+        args = caps.to_args
+      }.to have_deprecated(:capabilities)
 
-      args = caps.to_args
       expect(args.first).to eq :remote
       expect(args.last[:http_client]).to eq client
       actual_capabilities = args.last[:capabilities]
@@ -416,10 +434,10 @@ describe Watir::Capabilities do
       args = caps.to_args
       expect(args.first).to eq :remote
       expect(args.last[:http_client]).to eq client
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options).to be_a(Selenium::WebDriver::Chrome::Options)
       expect(actual_options.prefs).to eq(foo: 'bar')
-      proxy = args.last[:capabilities].first.proxy
+      proxy = args.last[:options].proxy
       expect(proxy).to be_a Selenium::WebDriver::Proxy
       expect(proxy.type).to eq(:manual)
       expect(proxy.http).to eq('127.0.0.1:8080')
@@ -442,7 +460,7 @@ describe Watir::Capabilities do
                                              headless: true,
                                              url: 'http://example.com')
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.args).to include '--headless', '--disable-gpu'
     end
 
@@ -452,22 +470,23 @@ describe Watir::Capabilities do
                                              url: 'http://example.com')
       args = capabilities.to_args
 
-      expect(args.last[:capabilities].first.args).to include '-headless'
+      expect(args.last[:options].args).to include '-headless'
     end
 
     it 'supports multiple vendor capabilities' do
-      sauce_options = {'sauce:options': {username: ENV['SAUCE_USERNAME'],
-                                         access_key: ENV['SAUCE_ACCESS_KEY']}}
+      sauce_options = {'sauce:options': {username: ENV.fetch('SAUCE_USERNAME', nil),
+                                         access_key: ENV.fetch('SAUCE_ACCESS_KEY', nil)}}
       other_options = {'other:options': {foo: 'bar'}}
 
       capabilities = Watir::Capabilities.new(:chrome,
                                              options: sauce_options.merge(other_options),
                                              url: 'https://ondemand.us-west-1.saucelabs.com')
 
-      se_caps = capabilities.to_args.last[:capabilities]
-      expect(se_caps).to include(Selenium::WebDriver::Chrome::Options.new(unhandled_prompt_behavior: :ignore))
-      expect(se_caps).to include(Selenium::WebDriver::Remote::Capabilities.new(sauce_options))
-      expect(se_caps).to include(Selenium::WebDriver::Remote::Capabilities.new(other_options))
+      generated_options = capabilities.to_args.last[:options]
+      expect(generated_options).to be_a(Selenium::WebDriver::Chrome::Options)
+      expect(generated_options.unhandled_prompt_behavior).to eq :ignore
+      expect(generated_options.instance_variable_get(:@options)[:'sauce:options']).to eq sauce_options[:'sauce:options']
+      expect(generated_options.instance_variable_get(:@options)[:'other:options']).to eq other_options[:'other:options']
     end
   end
 
@@ -476,14 +495,14 @@ describe Watir::Capabilities do
       capabilities = Watir::Capabilities.new
       args = capabilities.to_args
       expect(args.last[:http_client]).to be_a Watir::HttpClient
-      expect(args.last[:capabilities].first).to be_a Selenium::WebDriver::Chrome::Options
+      expect(args.last[:options]).to be_a Selenium::WebDriver::Chrome::Options
       expect(args.last).not_to include(:service)
     end
 
     it 'sets headless by creating options' do
       capabilities = Watir::Capabilities.new(:chrome, headless: true)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.args).to include '--headless', '--disable-gpu'
     end
 
@@ -492,7 +511,7 @@ describe Watir::Capabilities do
                                              options: Selenium::WebDriver::Chrome::Options.new,
                                              headless: true)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.args).to include '--headless', '--disable-gpu'
     end
 
@@ -502,7 +521,7 @@ describe Watir::Capabilities do
                                              options: options,
                                              headless: true)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.args).to include '--headless', '--disable-gpu', '--foo'
     end
 
@@ -510,7 +529,7 @@ describe Watir::Capabilities do
       options = {args: %w[--foo --bar]}
       capabilities = Watir::Capabilities.new(:chrome, options: options)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options).to be_a Selenium::WebDriver::Chrome::Options
       expect(actual_options.args).to include '--foo', '--bar'
     end
@@ -521,7 +540,7 @@ describe Watir::Capabilities do
       capabilities = Watir::Capabilities.new(:chrome,
                                              options: opts)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.page_load_strategy).to eq 'eager'
       expect(actual_options.args).to include '--foo', '--bar'
     end
@@ -534,7 +553,7 @@ describe Watir::Capabilities do
 
       capabilities = Watir::Capabilities.new(:firefox, options: options)
 
-      actual_options = capabilities.to_args.last[:capabilities].first
+      actual_options = capabilities.to_args.last[:options]
       expect(actual_options.args).to include '--foo'
       expect(actual_options.profile).to eq profile
     end
@@ -545,7 +564,7 @@ describe Watir::Capabilities do
 
       capabilities = Watir::Capabilities.new(:firefox, options: options)
 
-      actual_options = capabilities.to_args.last[:capabilities].first
+      actual_options = capabilities.to_args.last[:options]
       expect(actual_options.args).to include '--foo'
       expect(actual_options.profile).to eq profile
     end
@@ -553,7 +572,7 @@ describe Watir::Capabilities do
     it 'sets headless by creating options' do
       capabilities = Watir::Capabilities.new(:firefox, headless: true)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.args).to include '-headless'
     end
 
@@ -562,7 +581,7 @@ describe Watir::Capabilities do
                                              options: Selenium::WebDriver::Firefox::Options.new,
                                              headless: true)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.args).to include '-headless'
     end
 
@@ -572,7 +591,7 @@ describe Watir::Capabilities do
                                              options: options,
                                              headless: true)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.args).to include '-headless', '-foo'
     end
 
@@ -580,7 +599,7 @@ describe Watir::Capabilities do
       options = {args: %w[--foo --bar]}
       capabilities = Watir::Capabilities.new(:firefox, options: options)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options).to be_a Selenium::WebDriver::Firefox::Options
       expect(actual_options.args).to include '--foo', '--bar'
     end
@@ -591,7 +610,7 @@ describe Watir::Capabilities do
       capabilities = Watir::Capabilities.new(:firefox,
                                              options: opts)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.args).to include '--foo', '--bar'
       expect(actual_options.page_load_strategy).to eq 'eager'
     end
@@ -610,7 +629,7 @@ describe Watir::Capabilities do
       options = {automatic_inspection: true}
       capabilities = Watir::Capabilities.new(:safari, options: options)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options).to be_a Selenium::WebDriver::Safari::Options
       expect(actual_options.automatic_inspection).to eq true
     end
@@ -621,7 +640,7 @@ describe Watir::Capabilities do
       capabilities = Watir::Capabilities.new(:safari,
                                              options: opts)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.automatic_inspection).to eq true
       expect(actual_options.page_load_strategy).to eq 'eager'
     end
@@ -632,7 +651,7 @@ describe Watir::Capabilities do
       options = {args: %w[--foo --bar]}
       capabilities = Watir::Capabilities.new(:ie, options: options)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options).to be_a Selenium::WebDriver::IE::Options
       expect(actual_options.args).to include '--foo', '--bar'
     end
@@ -641,7 +660,7 @@ describe Watir::Capabilities do
       options = {browser_attach_timeout: true}
       capabilities = Watir::Capabilities.new(:ie, options: options)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options).to be_a Selenium::WebDriver::IE::Options
       expect(actual_options.options[:browser_attach_timeout]).to eq true
     end
@@ -652,7 +671,7 @@ describe Watir::Capabilities do
       capabilities = Watir::Capabilities.new(:ie,
                                              options: opts)
       args = capabilities.to_args
-      actual_options = args.last[:capabilities].first
+      actual_options = args.last[:options]
       expect(actual_options.args).to include '--foo'
       expect(actual_options.page_load_strategy).to eq 'eager'
     end

data/spec/unit/element_locator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'unit_helper'
 
 describe Watir::Locators::Element::Locator do

data/spec/unit/match_elements/button_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../unit_helper'
 
 describe Watir::Locators::Button::Matcher do

data/spec/unit/match_elements/element_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../unit_helper'
 
 describe Watir::Locators::Element::Matcher do
@@ -182,16 +184,16 @@ describe Watir::Locators::Element::Matcher do
       end
 
       it 'by visibility true' do
-        elements = [wd_element(tag_name: 'div', "displayed?": false),
-                    wd_element(tag_name: 'span', "displayed?": true)]
+        elements = [wd_element(tag_name: 'div', displayed?: false),
+                    wd_element(tag_name: 'span', displayed?: true)]
         @values_to_match = {visible: true}
 
         expect(matcher.match(elements, values_to_match, @filter)).to eq elements[1]
       end
 
       it 'by visibility false' do
-        elements = [wd_element(tag_name: 'div', "displayed?": true),
-                    wd_element(tag_name: 'span', "displayed?": false)]
+        elements = [wd_element(tag_name: 'div', displayed?: true),
+                    wd_element(tag_name: 'span', displayed?: false)]
         @values_to_match = {visible: false}
 
         expect(matcher.match(elements, values_to_match, @filter)).to eq elements[1]
@@ -287,9 +289,9 @@ describe Watir::Locators::Element::Matcher do
       end
 
       it 'by visibility false' do
-        elements = [wd_element("displayed?": false),
-                    wd_element("displayed?": true),
-                    wd_element("displayed?": false)]
+        elements = [wd_element(displayed?: false),
+                    wd_element(displayed?: true),
+                    wd_element(displayed?: false)]
         @values_to_match = {visible: false}
 
         expect(matcher.match(elements, values_to_match, @filter)).to eq [elements[0], elements[2]]
@@ -416,7 +418,7 @@ describe Watir::Locators::Element::Matcher do
         expect(matcher.match(elements, values_to_match, filter)).to eq nil
       end
 
-      # Note: This will work after:text_regexp deprecation removed
+      # NOTE: This will work after:text_regexp deprecation removed
       it 'keeps element from being located' do
         @values_to_match = {text: /some visible some hidden/}
         allow(browser).to receive(:execute_script).and_return('all visible', 'some visible')

data/spec/unit/match_elements/text_field_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../unit_helper'
 
 describe Watir::Locators::TextField::Matcher do

data/spec/unit/selector_builder/anchor_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../unit_helper'
 
 describe Watir::Locators::Anchor::SelectorBuilder do