watir 7.1.0 → 7.2.0

data/spec/unit/selector_builder/text_field_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../unit_helper'
 
 describe Watir::Locators::TextField::SelectorBuilder do
@@ -7,18 +9,18 @@ describe Watir::Locators::TextField::SelectorBuilder do
   let(:uppercase) { 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ' }
   let(:lowercase) { 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ' }
   let(:negative_types) do
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('file','#{uppercase}','#{lowercase}') and "\
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('radio','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('checkbox','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('submit','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('reset','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('image','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('button','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('hidden','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('range','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('color','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('date','#{uppercase}','#{lowercase}') and " \
-    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('datetime-local','#{uppercase}','#{lowercase}')"
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('file','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('radio','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('checkbox','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('submit','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('reset','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('image','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('button','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('hidden','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('range','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('color','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('date','#{uppercase}','#{lowercase}') and " \
+      "translate(@type,'#{uppercase}','#{lowercase}')!=translate('datetime-local','#{uppercase}','#{lowercase}')"
   end
 
   describe '#build' do
@@ -33,7 +35,8 @@ describe Watir::Locators::TextField::SelectorBuilder do
       it 'specified text field type that is text' do
         selector = {type: 'text'}
         built = {xpath: ".//*[local-name()='input']" \
-"[translate(@type,'#{uppercase}','#{lowercase}')=translate('text','#{uppercase}','#{lowercase}')]"}
+                        "[translate(@type,'#{uppercase}','#{lowercase}')=" \
+                        "translate('text','#{uppercase}','#{lowercase}')]"}
 
         expect(selector_builder.build(selector)).to eq built
       end
@@ -41,7 +44,8 @@ describe Watir::Locators::TextField::SelectorBuilder do
       it 'specified text field type that is not text' do
         selector = {type: 'number'}
         built = {xpath: ".//*[local-name()='input']" \
-"[translate(@type,'#{uppercase}','#{lowercase}')=translate('number','#{uppercase}','#{lowercase}')]"}
+                        "[translate(@type,'#{uppercase}','#{lowercase}')=" \
+                        "translate('number','#{uppercase}','#{lowercase}')]"}
 
         expect(selector_builder.build(selector)).to eq built
       end
@@ -143,7 +147,8 @@ describe Watir::Locators::TextField::SelectorBuilder do
       it 'using String' do
         selector = {label: 'First name'}
         built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]" \
-"[@id=//label[normalize-space()='First name']/@for or parent::label[normalize-space()='First name']]"}
+                        "[@id=//label[normalize-space()='First name']" \
+                        "/@for or parent::label[normalize-space()='First name']]"}
 
         expect(selector_builder.build(selector)).to eq built
       end
@@ -151,7 +156,8 @@ describe Watir::Locators::TextField::SelectorBuilder do
       it 'uses String with hidden text' do
         selector = {label: 'With hidden text'}
         built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]" \
-"[@id=//label[normalize-space()='With hidden text']/@for or parent::label[normalize-space()='With hidden text']]"}
+                        "[@id=//label[normalize-space()='With hidden text']" \
+                        "/@for or parent::label[normalize-space()='With hidden text']]"}
 
         expect(selector_builder.build(selector)).to eq built
       end
@@ -159,7 +165,8 @@ describe Watir::Locators::TextField::SelectorBuilder do
       it 'using simple Regexp' do
         selector = {label: /First/}
         built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]" \
-"[@id=//label[contains(normalize-space(), 'First')]/@for or parent::label[contains(normalize-space(), 'First')]]"}
+                        '[@id=//label[contains(normalize-space(), "First")]' \
+                        '/@for or parent::label[contains(normalize-space(), "First")]]'}
 
         expect(selector_builder.build(selector)).to eq built
       end
@@ -167,8 +174,9 @@ describe Watir::Locators::TextField::SelectorBuilder do
       it 'using complex Regexp' do
         selector = {label: /([qa])st? name/}
         built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]" \
-"[@id=//label[contains(normalize-space(), 's') and contains(normalize-space(), ' name')]/@for or " \
-"parent::label[contains(normalize-space(), 's') and contains(normalize-space(), ' name')]]",
+                        '[@id=//label[contains(normalize-space(), "s") and contains(normalize-space(), " name")]' \
+                        '/@for or parent::label[contains(normalize-space(), "s") ' \
+                        'and contains(normalize-space(), " name")]]',
                  label_element: /([qa])st? name/}
 
         expect(selector_builder.build(selector)).to eq built
@@ -178,8 +186,8 @@ describe Watir::Locators::TextField::SelectorBuilder do
     context 'with multiple locators' do
       it 'locates using tag name, class, attributes and text' do
         selector = {text: 'Developer', class: /c/, id: true}
-        built = {xpath: ".//*[local-name()='input'][contains(@class, 'c')]" \
-"[not(@type) or (#{negative_types})][@id]", text: 'Developer'}
+        built = {xpath: ".//*[local-name()='input'][contains(@class, \"c\")]" \
+                        "[not(@type) or (#{negative_types})][@id]", text: 'Developer'}
 
         expect(selector_builder.build(selector)).to eq built
       end

data/spec/unit/selector_builder/textarea_spec.rb

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

data/spec/unit/unit_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'watirspec/support/rspec_matchers'

data/spec/unit/wait_spec.rb

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

data/spec/watirspec/adjacent_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'watirspec_helper'
 
 describe 'Adjacent Elements' do
@@ -53,13 +55,13 @@ describe 'Adjacent Elements' do
     it 'accepts a tag name argument' do
       siblings = browser.div(id: 'second_sibling').siblings(tag_name: 'div')
       expect(siblings.size).to eq 3
-      expect(siblings.all? { |sib| sib.is_a? Watir::Div }).to eq true
+      expect(siblings.all?(Watir::Div)).to eq true
     end
 
     it 'accepts custom tag name argument' do
       siblings = browser.div(id: 'regular_child').siblings(tag_name: 'childelement')
       expect(siblings.size).to eq 3
-      expect(siblings.all? { |sib| sib.is_a? Watir::HTMLElement }).to eq true
+      expect(siblings.all?(Watir::HTMLElement)).to eq true
     end
 
     it 'accepts a class_name argument' do
@@ -67,7 +69,7 @@ describe 'Adjacent Elements' do
       expect(siblings.first).to be_a Watir::Div
       expect(siblings[0]).to be_a Watir::Div
       expect(siblings.size).to eq 2
-      expect(siblings.all? { |sib| sib.is_a? Watir::Div }).to eq true
+      expect(siblings.all?(Watir::Div)).to eq true
     end
   end
 
@@ -234,19 +236,19 @@ describe 'Adjacent Elements' do
     it 'accepts tag_name argument' do
       children = browser.div(id: 'parent').children(tag_name: 'div')
       expect(children.size).to eq 3
-      expect(children.all? { |child| child.is_a? Watir::Div }).to eq true
+      expect(children.all?(Watir::Div)).to eq true
     end
 
     it 'accepts custom tag_name argument' do
       children = browser.element(id: 'custom_parent').children(tag_name: 'childelement')
       expect(children.size).to eq 3
-      expect(children.all? { |child| child.is_a? Watir::HTMLElement }).to eq true
+      expect(children.all?(Watir::HTMLElement)).to eq true
     end
 
     it 'accepts a class_name argument' do
       children = browser.div(id: 'parent').children(class_name: 'b')
       expect(children.size).to eq 2
-      expect(children.all? { |child| child.is_a? Watir::Div }).to eq true
+      expect(children.all?(Watir::Div)).to eq true
     end
   end
 end

data/spec/watirspec/after_hooks_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'watirspec_helper'
 
 describe 'Browser::AfterHooks' do
@@ -7,45 +9,40 @@ describe 'Browser::AfterHooks' do
     end
 
     it 'runs the given proc on each page load' do
-      output = ''
-      proc = proc { |browser| output << browser.text }
+      proc = proc { |browser| @output = browser.text }
 
       begin
         browser.alert.dismiss if browser.alert.exists?
         browser.after_hooks.add(proc)
         browser.goto(WatirSpec.url_for('non_control_elements.html'))
 
-        expect(output).to include('Dubito, ergo cogito, ergo sum')
+        expect(@output).to include('Dubito, ergo cogito, ergo sum')
       ensure
         browser.after_hooks.delete(proc)
       end
     end
 
     it 'runs the given block on each page load' do
-      output = ''
-      begin
-        browser.after_hooks.add { |browser| output << browser.text }
-        browser.goto(WatirSpec.url_for('non_control_elements.html'))
+      browser.after_hooks.add { |browser| @output = browser.text }
+      browser.goto(WatirSpec.url_for('non_control_elements.html'))
 
-        expect(output).to include('Dubito, ergo cogito, ergo sum')
-      ensure
-        browser.after_hooks.delete browser.after_hooks[0]
-      end
+      expect(@output).to include('Dubito, ergo cogito, ergo sum')
+    ensure
+      browser.after_hooks.delete browser.after_hooks[0]
     end
   end
 
   describe '#delete' do
     it 'removes a previously added after_hook' do
-      output = ''
-      after_hook = ->(browser) { output << browser.text }
+      after_hook = ->(browser) { @output = browser.text }
 
       browser.after_hooks.add(after_hook)
       browser.goto(WatirSpec.url_for('non_control_elements.html'))
-      expect(output).to include('Dubito, ergo cogito, ergo sum')
+      expect(@output).to include('Dubito, ergo cogito, ergo sum')
 
       browser.after_hooks.delete(after_hook)
       browser.goto(WatirSpec.url_for('definition_lists.html'))
-      expect(output).to_not include('definition_lists')
+      expect(@output).to_not include('definition_lists')
     end
   end
 
@@ -53,7 +50,6 @@ describe 'Browser::AfterHooks' do
     before { @yield = nil }
 
     after(:each) do
-      browser.original_window.use
       browser.after_hooks.delete @page_after_hook
     end
 
@@ -162,11 +158,13 @@ describe 'Browser::AfterHooks' do
     end
 
     it 'does not raise error when running error checks on closed window',
-       except: {browser: :safari,
-                reason: 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException'},
-       exclude: {browser: :firefox,
-                 platform: :windows,
-                 reason: 'https://github.com/mozilla/geckodriver/issues/1847'} do
+       exclude: [{browser: :safari,
+                  reason: 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException'},
+                 {browser: :firefox,
+                  platform: :windows,
+                  reason: 'https://github.com/mozilla/geckodriver/issues/1847'},
+                 {browser: :ie,
+                  reason: 'IE and windows do not play well together'}] do
       url = WatirSpec.url_for('window_switching.html')
       @page_after_hook = proc { browser.url }
       browser.after_hooks.add @page_after_hook

data/spec/watirspec/alert_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'watirspec_helper'
 
 describe 'Alert API' do

data/spec/watirspec/attributes_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'watirspec_helper'
 
 describe 'Attributes' do

data/spec/watirspec/browser_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'watirspec_helper'
 
 describe 'Browser' do
@@ -9,7 +11,9 @@ describe 'Browser' do
 
     it 'returns false if window is closed',
        except: {browser: :safari,
-                reason: 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException'} do
+                reason: 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException'},
+       exclude: {browser: :ie,
+                 reason: 'IE does not like switching windows'} do
       browser.goto WatirSpec.url_for('window_switching.html')
       browser.a(id: 'open').click
       browser.windows.wait_until(size: 2)
@@ -182,7 +186,7 @@ describe 'Browser' do
         @opts[:url] = url
         @new_browser = WatirSpec.new_browser
 
-        server_url = @new_browser.driver.instance_variable_get('@bridge').http.instance_variable_get('@server_url')
+        server_url = @new_browser.driver.instance_variable_get(:@bridge).http.instance_variable_get(:@server_url)
         expect(server_url).to eq URI.parse(url)
       end
 
@@ -190,7 +194,7 @@ describe 'Browser' do
         @opts.merge!(url: url, open_timeout: 44, read_timeout: 47)
         @new_browser = WatirSpec.new_browser
 
-        http = @new_browser.driver.instance_variable_get('@bridge').http
+        http = @new_browser.driver.instance_variable_get(:@bridge).http
 
         expect(http.open_timeout).to eq 44
         expect(http.read_timeout).to eq 47
@@ -202,7 +206,7 @@ describe 'Browser' do
         @opts[:http_client] = http_client
         @new_browser = WatirSpec.new_browser
 
-        expect(@new_browser.driver.instance_variable_get('@bridge').http).to eq http_client
+        expect(@new_browser.driver.instance_variable_get(:@bridge).http).to eq http_client
       end
 
       it 'accepts Remote::Capabilities instance as :desired_capabilities', only: {browser: :firefox} do
@@ -250,7 +254,7 @@ describe 'Browser' do
           WatirSpec.implementation.browser_args = [:remote, opts]
           msg = /You can pass values directly into Watir::Browser opt without needing to use :desired_capabilities/
           expect { @new_browser = WatirSpec.new_browser }.to output(msg).to_stdout_from_any_process
-          server_url = @new_browser.driver.instance_variable_get('@bridge').http.instance_variable_get('@server_url')
+          server_url = @new_browser.driver.instance_variable_get(:@bridge).http.instance_variable_get(:@server_url)
           expect(server_url).to eq URI.parse(url)
         end
 
@@ -285,16 +289,16 @@ describe 'Browser' do
 
       service = Selenium::WebDriver::Service.send(browser_name, port: '2314', args: ['foo'])
 
-      @opts.merge!(service: service,
-                   listener: LocalConfig::SelectorListener.new)
+      @opts[:service] = service
+      @opts[:listener] = LocalConfig::SelectorListener.new
 
       @new_browser = WatirSpec.new_browser
 
-      bridge = @new_browser.wd.instance_variable_get('@bridge')
+      bridge = @new_browser.wd.instance_variable_get(:@bridge)
       expect(bridge).to be_a Selenium::WebDriver::Support::EventFiringBridge
-      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
+      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
     ensure
@@ -385,7 +389,7 @@ describe 'Browser' do
     end
 
     it 'returns correct Ruby objects' do
-      expect(browser.execute_script('return {a: 1, "b": 2}')).to eq Hash['a' => 1, 'b' => 2]
+      expect(browser.execute_script('return {a: 1, "b": 2}')).to eq({'a' => 1, 'b' => 2})
       expect(browser.execute_script('return [1, 2, "3"]')).to match_array([1, 2, '3'])
       expect(browser.execute_script('return 1.2 + 1.3')).to eq 2.5
       expect(browser.execute_script('return 2 + 2')).to eq 4