watir 7.2.0 → 7.2.1

data/spec/unit/selector_builder/text_field_spec.rb

@@ -2,194 +2,201 @@
 
 require_relative '../unit_helper'
 
-describe Watir::Locators::TextField::SelectorBuilder do
-  include LocatorSpecHelper
-
-  let(:selector_builder) { described_class.new(attributes, query_scope) }
-  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}')"
-  end
-
-  describe '#build' do
-    it 'without any arguments' do
-      selector = {}
-      built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
-
-      expect(selector_builder.build(selector)).to eq built
-    end
-
-    context 'with type' 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}')]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      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}')]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      it 'true locates text field with a type specified' do
-        selector = {type: true}
-        built = {xpath: ".//*[local-name()='input'][#{negative_types}]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      it 'false locates text field without type specified' do
-        selector = {type: false}
-        built = {xpath: ".//*[local-name()='input'][not(@type)]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      it 'raises exception when a non-text field type input is specified' do
-        selector = {type: 'checkbox'}
-        msg = 'TextField Elements can not be located by type: checkbox'
-
-        expect { selector_builder.build(selector) }
-          .to raise_exception Watir::Exception::LocatorException, msg
-      end
-    end
-
-    context 'with index' do
-      it 'positive' do
-        selector = {index: 4}
-        built = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[5]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      it 'negative' do
-        selector = {index: -3}
-        built = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[last()-2]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      it 'last' do
-        selector = {index: -1}
-        built = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[last()]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      it 'does not return index if it is zero' do
-        selector = {index: 0}
-        built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      it 'raises exception when index is not an Integer' do
-        selector = {index: 'foo'}
-        msg = /expected one of \[(Integer|Fixnum)\], got "foo":String/
-
-        expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
-      end
-    end
-
-    context 'with wrong tag name' do
-      # TODO: Should this throw exception?
-      it 'ignores tag name' do
-        selector = {tag_name: 'div'}
-        built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-    end
-
-    context 'with text' do
-      it 'String for value' do
-        selector = {text: 'Developer'}
-        built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]", text: 'Developer'}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      it 'Simple Regexp for value' do
-        selector = {text: /Dev/}
-        built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]", text: /Dev/}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      it 'returns complicated Regexp to the locator as a value' do
-        selector = {text: /^foo$/}
-        built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]", text: /^foo$/}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-    end
-
-    context 'with label' 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']]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      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']]"}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      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")]]'}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-
-      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")]]',
-                 label_element: /([qa])st? name/}
-
-        expect(selector_builder.build(selector)).to eq built
-      end
-    end
-
-    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'}
-
-        expect(selector_builder.build(selector)).to eq built
+module Watir
+  module Locators
+    class TextField
+      describe SelectorBuilder do
+        include LocatorSpecHelper
+
+        let(:selector_builder) { described_class.new(attributes, query_scope) }
+        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}')"
+        end
+
+        describe '#build' do
+          it 'without any arguments' do
+            selector = {}
+            built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
+
+            expect(selector_builder.build(selector)).to eq built
+          end
+
+          context 'with type' 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}')]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            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}')]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            it 'true locates text field with a type specified' do
+              selector = {type: true}
+              built = {xpath: ".//*[local-name()='input'][#{negative_types}]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            it 'false locates text field without type specified' do
+              selector = {type: false}
+              built = {xpath: ".//*[local-name()='input'][not(@type)]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            it 'raises exception when a non-text field type input is specified' do
+              selector = {type: 'checkbox'}
+              msg = 'TextField Elements can not be located by type: checkbox'
+
+              expect { selector_builder.build(selector) }
+                .to raise_exception Watir::Exception::LocatorException, msg
+            end
+          end
+
+          context 'with index' do
+            it 'positive' do
+              selector = {index: 4}
+              built = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[5]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            it 'negative' do
+              selector = {index: -3}
+              built = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[last()-2]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            it 'last' do
+              selector = {index: -1}
+              built = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[last()]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            it 'does not return index if it is zero' do
+              selector = {index: 0}
+              built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            it 'raises exception when index is not an Integer' do
+              selector = {index: 'foo'}
+              msg = /expected one of \[(Integer|Fixnum)\], got "foo":String/
+
+              expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
+            end
+          end
+
+          context 'with wrong tag name' do
+            # TODO: Should this throw exception?
+            it 'ignores tag name' do
+              selector = {tag_name: 'div'}
+              built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+          end
+
+          context 'with text' do
+            it 'String for value' do
+              selector = {text: 'Developer'}
+              built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]", text: 'Developer'}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            it 'Simple Regexp for value' do
+              selector = {text: /Dev/}
+              built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]", text: /Dev/}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            it 'returns complicated Regexp to the locator as a value' do
+              selector = {text: /^foo$/}
+              built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]", text: /^foo$/}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+          end
+
+          context 'with label' 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']]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            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']]"}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            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")]]'}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+
+            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")]]',
+                       label_element: /([qa])st? name/}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+          end
+
+          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'}
+
+              expect(selector_builder.build(selector)).to eq built
+            end
+          end
+        end
       end
     end
   end

data/spec/unit/selector_builder/textarea_spec.rb

@@ -2,25 +2,33 @@
 
 require_relative '../unit_helper'
 
-describe Watir::Locators::TextArea::SelectorBuilder do
-  include LocatorSpecHelper
+module Watir
+  module Locators
+    class TextArea
+      describe SelectorBuilder do
+        include LocatorSpecHelper
 
-  let(:selector_builder) { described_class.new(attributes, query_scope) }
+        let(:selector_builder) { described_class.new(attributes, query_scope) }
 
-  describe '#build' do
-    context 'Always returns value argument' do
-      it 'String' do
-        selector = {tag_name: 'textarea', value: 'Foo'}
-        built = {xpath: ".//*[local-name()='textarea']", value: 'Foo'}
+        describe '#build' do
+          context 'when String value' do
+            it 'returns value argument' do
+              selector = {tag_name: 'textarea', value: 'Foo'}
+              built = {xpath: ".//*[local-name()='textarea']", value: 'Foo'}
 
-        expect(selector_builder.build(selector)).to eq built
-      end
+              expect(selector_builder.build(selector)).to eq built
+            end
+          end
 
-      it 'Regexp' do
-        selector = {tag_name: 'textarea', value: /Foo/}
-        built = {xpath: ".//*[local-name()='textarea']", value: /Foo/}
+          context 'when Regexp value' do
+            it 'returns value argument' do
+              selector = {tag_name: 'textarea', value: /Foo/}
+              built = {xpath: ".//*[local-name()='textarea']", value: /Foo/}
 
-        expect(selector_builder.build(selector)).to eq built
+              expect(selector_builder.build(selector)).to eq built
+            end
+          end
+        end
       end
     end
   end

data/spec/unit/wait_spec.rb

@@ -2,94 +2,98 @@
 
 require_relative 'unit_helper'
 
-describe Watir::Wait do
-  describe '#until' do
-    it 'waits until the block returns true' do
-      Watir::Wait.until(timeout: 0.5) { @result = true }
-      expect(@result).to be true
+module Watir
+  describe Wait do
+    describe '#until' do
+      it 'waits until the block returns true' do
+        described_class.until(timeout: 0.5) { @result = true }
+        expect(@result).to be true
+      end
+
+      it 'executes block if timeout is zero' do
+        described_class.until(timeout: 0) { @result = true }
+        expect(@result).to be true
+      end
+
+      it 'times out' do
+        expect { described_class.until(timeout: 0.5) { false } }.to raise_error(Watir::Wait::TimeoutError)
+      end
+
+      it 'times out with a custom message' do
+        expect {
+          described_class.until(timeout: 0.5, message: 'oops') { false }
+        }.to raise_error(Watir::Wait::TimeoutError, 'timed out after 0.5 seconds, oops')
+      end
+
+      it 'uses provided interval' do
+        expect {
+          described_class.until(timeout: 0.4, interval: 0.2) do
+            @result = @result.nil? ? 1 : @result + 1
+            false
+          end
+        }.to raise_timeout_exception
+        expect(@result).to eq 2
+      end
+
+      it 'uses timer for waiting' do
+        timer = described_class.timer
+        allow(timer).to receive(:wait).and_call_original
+        described_class.until(timeout: 0.5) { true }
+        expect(timer).to have_received(:wait).with(0.5)
+      end
     end
 
-    it 'executes block if timeout is zero' do
-      Watir::Wait.until(timeout: 0) { @result = true }
-      expect(@result).to be true
+    describe '#while' do
+      it 'waits while the block returns true' do
+        expect(described_class.while(timeout: 0.5) { false }).to be_nil
+      end
+
+      it 'executes block if timeout is zero' do
+        expect(described_class.while(timeout: 0) { false }).to be_nil
+      end
+
+      it 'times out' do
+        expect { described_class.while(timeout: 0.5) { true } }.to raise_error(Watir::Wait::TimeoutError)
+      end
+
+      it 'times out with a custom message' do
+        expect {
+          described_class.while(timeout: 0.5, message: 'oops') { true }
+        }.to raise_error(Watir::Wait::TimeoutError, 'timed out after 0.5 seconds, oops')
+      end
+
+      it 'uses provided interval' do
+        expect {
+          described_class.while(timeout: 0.4, interval: 0.2) do
+            @result = @result.nil? ? 1 : @result + 1
+            true
+          end
+        }.to raise_timeout_exception
+        expect(@result).to eq 2
+      end
+
+      it 'uses timer for waiting' do
+        timer = described_class.timer
+        allow(timer).to receive(:wait).and_call_original
+        described_class.while(timeout: 0.5) { false }
+        expect(timer).to have_received(:wait).with(0.5)
+      end
     end
 
-    it 'times out' do
-      expect { Watir::Wait.until(timeout: 0.5) { false } }.to raise_error(Watir::Wait::TimeoutError)
+    describe '#timer' do
+      it 'returns default timer' do
+        expect(described_class.timer).to be_a(Watir::Wait::Timer)
+      end
     end
 
-    it 'times out with a custom message' do
-      expect {
-        Watir::Wait.until(timeout: 0.5, message: 'oops') { false }
-      }.to raise_error(Watir::Wait::TimeoutError, 'timed out after 0.5 seconds, oops')
-    end
-
-    it 'uses provided interval' do
-      expect {
-        Watir::Wait.until(timeout: 0.4, interval: 0.2) do
-          @result = @result.nil? ? 1 : @result + 1
-          false
-        end
-      }.to raise_timeout_exception
-      expect(@result).to eq 2
-    end
-
-    it 'uses timer for waiting' do
-      timer = Watir::Wait.timer
-      expect(timer).to receive(:wait).with(0.5).and_call_original
-      Watir::Wait.until(timeout: 0.5) { true }
-    end
-  end
-
-  describe '#while' do
-    it 'waits while the block returns true' do
-      expect(Watir::Wait.while(timeout: 0.5) { false }).to be_nil
-    end
-
-    it 'executes block if timeout is zero' do
-      expect(Watir::Wait.while(timeout: 0) { false }).to be_nil
-    end
-
-    it 'times out' do
-      expect { Watir::Wait.while(timeout: 0.5) { true } }.to raise_error(Watir::Wait::TimeoutError)
-    end
-
-    it 'times out with a custom message' do
-      expect {
-        Watir::Wait.while(timeout: 0.5, message: 'oops') { true }
-      }.to raise_error(Watir::Wait::TimeoutError, 'timed out after 0.5 seconds, oops')
-    end
-
-    it 'uses provided interval' do
-      expect {
-        Watir::Wait.while(timeout: 0.4, interval: 0.2) do
-          @result = @result.nil? ? 1 : @result + 1
-          true
-        end
-      }.to raise_timeout_exception
-      expect(@result).to eq 2
-    end
-
-    it 'uses timer for waiting' do
-      timer = Watir::Wait.timer
-      expect(timer).to receive(:wait).with(0.5).and_call_original
-      Watir::Wait.while(timeout: 0.5) { false }
-    end
-  end
-
-  describe '#timer' do
-    it 'returns default timer' do
-      expect(Watir::Wait.timer).to be_a(Watir::Wait::Timer)
-    end
-  end
-
-  describe '#timer=' do
-    after { Watir::Wait.timer = nil }
+    describe '#timer=' do
+      after { described_class.timer = nil }
 
-    it 'changes default timer' do
-      timer = Class.new
-      Watir::Wait.timer = timer
-      expect(Watir::Wait.timer).to eq(timer)
+      it 'changes default timer' do
+        timer = Class.new
+        described_class.timer = timer
+        expect(described_class.timer).to eq(timer)
+      end
     end
   end
 end