RubyGems - watir - Versions diffs - 6.16.5 → 6.19.1 - Mend

watir 6.16.5 → 6.19.1

Files changed (110) hide show

checksums.yaml +5 -5
data/.github/actions/enable-safari/action.yml +11 -0
data/.github/actions/install-chrome/action.yml +11 -0
data/.github/workflows/linux.yml +61 -0
data/.github/workflows/mac.yml +55 -0
data/.github/workflows/unit.yml +37 -0
data/.github/workflows/windows.yml +39 -0
data/.rubocop.yml +32 -107
data/.rubocop_todo.yml +36 -0
data/CHANGES.md +52 -0
data/Gemfile +3 -1
data/LICENSE +2 -2
data/README.md +9 -10
data/Rakefile +4 -4
data/lib/watir/adjacent.rb +8 -10
data/lib/watir/after_hooks.rb +4 -4
data/lib/watir/alert.rb +1 -0
data/lib/watir/attribute_helper.rb +2 -0
data/lib/watir/browser.rb +7 -3
data/lib/watir/capabilities.rb +245 -97
data/lib/watir/cookies.rb +3 -1
data/lib/watir/element_collection.rb +21 -6
data/lib/watir/elements/element.rb +66 -53
data/lib/watir/elements/file_field.rb +1 -0
data/lib/watir/elements/html_elements.rb +0 -1
data/lib/watir/elements/iframe.rb +4 -3
data/lib/watir/elements/link.rb +0 -9
data/lib/watir/elements/radio.rb +1 -1
data/lib/watir/elements/select.rb +22 -7
data/lib/watir/generator/base/spec_extractor.rb +4 -4
data/lib/watir/generator/html/generator.rb +1 -1
data/lib/watir/has_window.rb +17 -15
data/lib/watir/http_client.rb +17 -0
data/lib/watir/js_execution.rb +3 -3
data/lib/watir/js_snippets.rb +2 -2
data/lib/watir/legacy_wait.rb +1 -1
data/lib/watir/locators/element/selector_builder/xpath.rb +50 -15
data/lib/watir/locators/element/selector_builder.rb +12 -13
data/lib/watir/locators/text_field/selector_builder/xpath.rb +3 -1
data/lib/watir/locators.rb +1 -3
data/lib/watir/logger.rb +7 -20
data/lib/watir/radio_set.rb +2 -2
data/lib/watir/user_editable.rb +6 -2
data/lib/watir/version.rb +1 -1
data/lib/watir/wait/timer.rb +1 -1
data/lib/watir/wait.rb +2 -0
data/lib/watir/window.rb +8 -4
data/lib/watir/window_collection.rb +114 -0
data/lib/watir-webdriver.rb +1 -1
data/lib/watir.rb +3 -1
data/lib/watirspec/guards.rb +1 -1
data/lib/watirspec/implementation.rb +3 -5
data/lib/watirspec/rake_tasks.rb +2 -0
data/lib/watirspec/runner.rb +6 -2
data/lib/watirspec/server.rb +1 -1
data/lib/watirspec.rb +2 -1
data/spec/spec_helper.rb +2 -7
data/spec/unit/capabilities_spec.rb +1234 -18
data/spec/unit/container_spec.rb +1 -1
data/spec/unit/logger_spec.rb +5 -7
data/spec/unit/match_elements/element_spec.rb +17 -15
data/spec/unit/selector_builder/button_spec.rb +16 -15
data/spec/unit/selector_builder/element_spec.rb +58 -9
data/spec/unit/selector_builder/text_field_spec.rb +14 -14
data/spec/unit/unit_helper.rb +2 -4
data/spec/watirspec/after_hooks_spec.rb +58 -68
data/spec/watirspec/alert_spec.rb +69 -79
data/spec/watirspec/browser_spec.rb +51 -48
data/spec/watirspec/cookies_spec.rb +52 -37
data/spec/watirspec/drag_and_drop_spec.rb +14 -38
data/spec/watirspec/elements/button_spec.rb +2 -0
data/spec/watirspec/elements/buttons_spec.rb +1 -1
data/spec/watirspec/elements/checkbox_spec.rb +8 -4
data/spec/watirspec/elements/date_field_spec.rb +18 -9
data/spec/watirspec/elements/date_time_field_spec.rb +3 -4
data/spec/watirspec/elements/div_spec.rb +62 -54
data/spec/watirspec/elements/element_spec.rb +73 -88
data/spec/watirspec/elements/elements_spec.rb +12 -3
data/spec/watirspec/elements/filefield_spec.rb +25 -50
data/spec/watirspec/elements/form_spec.rb +6 -8
data/spec/watirspec/elements/frame_spec.rb +10 -13
data/spec/watirspec/elements/iframe_spec.rb +12 -9
data/spec/watirspec/elements/iframes_spec.rb +2 -2
data/spec/watirspec/elements/link_spec.rb +23 -12
data/spec/watirspec/elements/links_spec.rb +11 -3
data/spec/watirspec/elements/option_spec.rb +15 -17
data/spec/watirspec/elements/select_list_spec.rb +222 -117
data/spec/watirspec/elements/text_field_spec.rb +8 -4
data/spec/watirspec/elements/tr_spec.rb +0 -9
data/spec/watirspec/html/forms_with_input_elements.html +1 -0
data/spec/watirspec/html/iframes.html +3 -0
data/spec/watirspec/html/non_control_elements.html +4 -4
data/spec/watirspec/html/right_click.html +12 -0
data/spec/watirspec/html/special_chars.html +3 -0
data/spec/watirspec/html/wait.html +6 -6
data/spec/watirspec/html/window_switching.html +10 -0
data/spec/watirspec/legacy_wait_spec.rb +216 -0
data/spec/watirspec/special_chars_spec.rb +10 -0
data/spec/watirspec/support/rspec_matchers.rb +33 -14
data/spec/watirspec/user_editable_spec.rb +1 -1
data/spec/watirspec/wait_spec.rb +257 -305
data/spec/watirspec/window_switching_spec.rb +347 -211
data/spec/watirspec_helper.rb +17 -20
data/support/doctest_helper.rb +0 -2
data/watir.gemspec +6 -7
metadata +37 -26
data/.travis.yml +0 -84
data/appveyor.yml +0 -12
data/lib/watir/elements/area.rb +0 -10
data/spec/watirspec/relaxed_locate_spec.rb +0 -113

data/spec/watirspec/html/wait.html CHANGED Viewed

@@ -58,14 +58,14 @@
   <body>
     <div id="foo" custom="" style="display:block;">foo</div>
     <div id="bar" style="display:none;" onclick='this.innerHTML = "changed"'>bar</div>
-    <a id="show_bar" href="#" onclick="setTimeoutDisplay('bar', 'block', 500);">show bar</a>
-    <a id="hide_foo" href="#" onclick="setTimeoutDisplay('foo', 'none', 500);">hide foo</a>
+    <a id="show_bar" href="#" onclick="setTimeoutDisplay('bar', 'block', 1000);">show bar</a>
+    <a id="hide_foo" href="#" onclick="setTimeoutDisplay('foo', 'none', 1000);">hide foo</a>
     <a id="remove_foo" href="#" onclick="setTimeoutRemove('foo', 1000);">remove foo</a>
     <a id="add_foobar" href="#" onclick="setTimeoutAddDisplay('foobar', 'bar', 1000);">add foobar</a>
     <a id="readd_bar" href="#" onclick="setTimeoutRemove('bar', 500); setTimeoutAddDisplay('bar', 'foo', 1000);">re-add bar</a>
     <div id="buttons">
-      <button id="btn" type="button" onclick="setDisabled('btn', true, 0)" disabled>Click To Disable!</button>
-      <a id="enable_btn" href="#" onclick="setDisabled('btn', false, 500);">enable btn</a>
+      <button id="btn" type="button" onclick="setDisabled('btn', true, 0);" disabled>Click To Disable!</button>
+      <a id="enable_btn" href="#" onclick="setDisabled('btn', false, 1000);">enable btn</a>
       <button id="btn2" style="display:none;" type="button" disabled>Hidden and Disabled</button>
       <a id="show_and_enable_btn" href="#" onclick="setTimeoutDisplay('btn2', 'block', 500); setDisabled('btn2', false, 1000);">
         show and enable btn
@@ -78,10 +78,10 @@
     <form>
       <label for="textfield">Not Displayed Yet</label>
       <input type="textfield" title="Text Displayed" name="textfield" id="textfield" style="display:none;" /> <br  />
-      <a id="show_textfield" href="#" onclick="setTimeoutDisplay('textfield', 'block', 2000);">show textfield</a>
+      <a id="show_textfield" href="#" onclick="setTimeoutDisplay('textfield', 'block', 1000);">show textfield</a>
       <label for="writable">Not Writable</label>
       <input type="text" title="Not Writable" name="writable" id="writable" readonly/> <br  />
-      <a id="make-writable" onclick="makeWritable('writable', 2000);">Make Writable</a>
+      <a id="make-writable" onclick="makeWritable('writable', 1000);">Make Writable</a>
       <fieldset>
         <select name="languages" id="languages", style="display: none">
           <option id="danish" value="1">Danish</option>

data/spec/watirspec/html/window_switching.html CHANGED Viewed

@@ -2,11 +2,21 @@
 <html>
   <head>
     <title>window switching</title>
+    <script>
+        function windowOpenDelayed(timeout) {
+            setTimeout(function() {
+                window.open("closeable.html");
+            }, timeout);
+        }
+    </script>
   </head>
   <body>
     <p>
       Click <a id="open" href="#" onclick='window.open("closeable.html")'>here</a> to open a new window.
     </p>
+    <p>
+      Click <a id="delayed" href="#" onclick=windowOpenDelayed(1000)>here</a> to open a new window after a delay.
+    </p>
   </body>
 </html>

data/spec/watirspec/legacy_wait_spec.rb ADDED Viewed

@@ -0,0 +1,216 @@
+require 'watirspec_helper'
+describe Watir::Element do
+  before do
+    browser.goto WatirSpec.url_for('wait.html')
+  end
+  compliant_on :relaxed_locate do
+    describe '#wait_until_present' do
+      it 'waits until the element appears' do
+        browser.a(id: 'show_bar').click
+        expect {
+          expect { browser.div(id: 'bar').wait_until_present(timeout: 5) }.to_not raise_exception
+        }.to have_deprecated_wait_until_present
+      end
+      bug 'Safari does not recognize date type', :safari do
+        it 'waits until the element re-appears' do
+          browser.link(id: 'readd_bar').click
+          expect {
+            expect { browser.div(id: 'bar').wait_until_present }.to_not raise_exception
+          }.to have_deprecated_wait_until_present
+        end
+      end
+      it "times out if the element doesn't appear" do
+        inspected = '#<Watir::Div: located: true; {:id=>"bar", :tag_name=>"div"}>'
+        error = Watir::Wait::TimeoutError
+        message = "timed out after 1 seconds, waiting for #{inspected} to become present"
+        expect {
+          expect { browser.div(id: 'bar').wait_until_present(timeout: 1) }.to raise_error(error, message)
+        }.to have_deprecated_wait_until_present
+      end
+      it 'uses provided interval' do
+        element = browser.div(id: 'bar')
+        expect(element).to receive(:present?).twice
+        expect {
+          expect { element.wait_until_present(timeout: 0.4, interval: 0.2) }.to raise_timeout_exception
+        }.to have_deprecated_wait_until_present
+      end
+    end
+    describe '#wait_while_present' do
+      it 'waits until the element disappears' do
+        browser.a(id: 'hide_foo').click
+        expect {
+          expect { browser.div(id: 'foo').wait_while_present(timeout: 2) }.to_not raise_exception
+        }.to have_deprecated_wait_while_present
+      end
+      it "times out if the element doesn't disappear" do
+        error = Watir::Wait::TimeoutError
+        inspected = '#<Watir::Div: located: true; {:id=>"foo", :tag_name=>"div"}>'
+        message = "timed out after 1 seconds, waiting for #{inspected} not to be present"
+        expect {
+          expect { browser.div(id: 'foo').wait_while_present(timeout: 1) }.to raise_error(error, message)
+        }.to have_deprecated_wait_while_present
+      end
+      it 'uses provided interval' do
+        error = Watir::Wait::TimeoutError
+        element = browser.div(id: 'foo')
+        expect(element).to receive(:present?).and_return(true).twice
+        expect {
+          expect { element.wait_while_present(timeout: 0.4, interval: 0.2) }.to raise_error(error)
+        }.to have_deprecated_wait_while_present
+      end
+      it 'does not error when element goes stale' do
+        element = browser.div(id: 'foo').locate
+        allow(element).to receive(:stale?).and_return(false, true)
+        browser.a(id: 'hide_foo').click
+        expect {
+          expect { element.wait_while_present(timeout: 2) }.to_not raise_exception
+        }.to have_deprecated_wait_while_present
+      end
+      it 'waits until the selector no longer matches' do
+        element = browser.link(name: 'add_select').wait_until(&:exists?)
+        browser.link(id: 'change_select').click
+        expect {
+          expect { element.wait_while_present }.not_to raise_error
+        }.to have_deprecated_wait_while_present
+      end
+    end
+  end
+  not_compliant_on :relaxed_locate do
+    describe '#when_present' do
+      it 'invokes subsequent method calls when the element becomes present' do
+        browser.a(id: 'show_bar').click
+        bar = browser.div(id: 'bar')
+        bar.when_present(2).click
+        expect(bar.text).to eq 'changed'
+      end
+      it 'times out when given a block' do
+        expect { browser.div(id: 'bar').when_present(1) {} }.to raise_error(Watir::Wait::TimeoutError)
+      end
+      it 'times out when not given a block' do
+        locator = '(\{:id=>"bar", :tag_name=>"div"\}|\{:tag_name=>"div", :id=>"bar"\})'
+        msg = /^timed out after 1 seconds, waiting for #{locator} to become present$/
+        expect { browser.div(id: 'bar').when_present(1).click }.to raise_error(Watir::Wait::TimeoutError, msg)
+      end
+      it 'responds to Element methods' do
+        decorator = browser.div.when_present
+        expect(decorator).to respond_to(:exist?)
+        expect(decorator).to respond_to(:present?)
+        expect(decorator).to respond_to(:click)
+      end
+      it 'delegates present? to element' do
+        Object.class_eval do
+          def present?
+            false
+          end
+        end
+        element = browser.a(id: 'show_bar').when_present(1)
+        expect(element).to be_present
+      end
+      it 'processes before calling present?' do
+        browser.a(id: 'show_bar').click
+        expect(browser.div(id: 'bar').when_present.present?).to be true
+      end
+    end
+    describe '#wait_until &:enabled?' do
+      it 'invokes subsequent method calls when the element becomes enabled' do
+        browser.a(id: 'enable_btn').click
+        btn = browser.button(id: 'btn')
+        btn.wait_until(timeout: 2, &:enabled?).click
+        Watir::Wait.while { btn.enabled? }
+        expect(btn.disabled?).to be true
+      end
+      it 'times out' do
+        error = Watir::Wait::TimeoutError
+        inspected = '#<Watir::Button: located: true; {:id=>"btn", :tag_name=>"button"}>'
+        message = "timed out after 1 seconds, waiting for true condition on #{inspected}"
+        element = browser.button(id: 'btn')
+        expect { element.wait_until(timeout: 1, &:enabled?).click }.to raise_error(error, message)
+      end
+      it 'responds to Element methods' do
+        element = browser.button.wait_until { true }
+        expect(element).to respond_to(:exist?)
+        expect(element).to respond_to(:present?)
+        expect(element).to respond_to(:click)
+      end
+      it 'can be chained with #wait_until &:present?' do
+        browser.a(id: 'show_and_enable_btn').click
+        browser.button(id: 'btn2').wait_until(&:present?).wait_until(&:enabled?).click
+        expect(browser.button(id: 'btn2')).to exist
+        expect(browser.button(id: 'btn2')).to be_enabled
+      end
+    end
+    context 'when acting on an element that is never present' do
+      it 'raises exception immediately' do
+        element = browser.link(id: 'not_there')
+        start_time = ::Time.now
+        expect { element.click }.to raise_exception(Watir::Exception::UnknownObjectException)
+        expect(::Time.now - start_time).to be < 1
+      end
+    end
+    context 'when acting on an element that eventually becomes present' do
+      it 'raises exception immediately' do
+        start_time = ::Time.now
+        browser.a(id: 'show_bar').click
+        expect { browser.div(id: 'bar').click }.to raise_unknown_object_exception
+        expect(::Time.now - start_time).to be < 1
+      end
+    end
+  end
+end
+describe Watir::Window do
+  not_compliant_on :relaxed_locate do
+    describe '#wait_until &:present?' do
+      before do
+        browser.goto WatirSpec.url_for('window_switching.html')
+        browser.a(id: 'open').click
+        Watir::Wait.until { browser.windows.size == 2 }
+      end
+      after do
+        browser.original_window.use
+        browser.windows.reject(&:current?).each(&:close)
+      end
+      it 'times out waiting for a non-present window' do
+        expect {
+          browser.window(title: 'noop').wait_until(timeout: 0.5, &:present?)
+        }.to raise_error(Watir::Wait::TimeoutError)
+      end
+    end
+  end
+end

data/spec/watirspec/special_chars_spec.rb CHANGED Viewed

@@ -8,4 +8,14 @@ describe Watir::Browser do
   it 'finds elements with single quotes' do
     expect(browser.div(text: "single 'quotes'")).to exist
   end
+  it 'finds elements with non-standard character locators' do
+    expect(browser.div('we{ird' => 'foo')).to exist
+    expect(browser.div('we{ird': 'foo')).to exist
+  end
+  it 'finds element with underscored attribute' do
+    expect(browser.div('underscored_attribute' => 'true')).to exist
+    expect(browser.div('underscored_attribute' => true)).to exist
+  end
 end

data/spec/watirspec/support/rspec_matchers.rb CHANGED Viewed

@@ -1,5 +1,18 @@
 if defined?(RSpec)
   DEPRECATION_WARNINGS = %i[selector_parameters
+                            options_capabilities
+                            firefox_profile
+                            remote_keyword
+                            desired_capabilities
+                            port_keyword
+                            switches_keyword
+                            args_keyword
+                            url_service
+                            driver_opts_keyword
+                            http_open_timeout
+                            http_read_timeout
+                            http_client_timeout
+                            unknown_keyword
                             element_cache
                             ready_state
                             caption
@@ -8,18 +21,23 @@ if defined?(RSpec)
                             visible_text
                             link_text
                             text_regexp
+                            scroll_into_view
                             stale_exists
                             stale_visible
                             stale_present
+                            select_all
                             select_by
                             value_button
                             wait_until_present
-                            wait_while_present].freeze
+                            wait_while_present
+                            window_index].freeze
   DEPRECATION_WARNINGS.each do |deprecation|
     RSpec::Matchers.define "have_deprecated_#{deprecation}" do
       match do |actual|
-        warning = /\[DEPRECATION\] \["#{deprecation}"\]/
+        return actual.call if ENV['IGNORE_DEPRECATIONS']
+        warning = /\[DEPRECATION\] \["#{deprecation}"/
         expect {
           actual.call
           @stdout_message = File.read $stdout if $stdout.is_a?(File)
@@ -62,10 +80,10 @@ if defined?(RSpec)
         begin
           actual.call
           false
-        rescue exception => ex
-          return true if message.nil? || ex.message.match(message)
+        rescue exception => e
+          return true if message.nil? || e.message.match(message)
-          raise exception, "expected '#{message}' to be included in: '#{ex.message}'"
+          raise exception, "expected '#{message}' to be included in: '#{e.message}'"
         ensure
           Watir.default_timeout = original_timeout
         end
@@ -88,10 +106,10 @@ if defined?(RSpec)
           start_time = ::Time.now
           actual.call
           false
-        rescue exception => ex
+        rescue exception => e
           finish_time = ::Time.now
-          unless message.nil? || ex.message.match(message)
-            raise exception, "expected '#{message}' to be included in: '#{ex.message}'"
+          unless message.nil? || e.message.match(message)
+            raise exception, "expected '#{message}' to be included in: '#{e.message}'"
           end
           @time_difference = finish_time - start_time
@@ -116,27 +134,28 @@ if defined?(RSpec)
     end
   end
-  RSpec::Matchers.define :execute_immediately do |timeout: 10|
+  RSpec::Matchers.define :execute_when_satisfied do |min: 0, max: nil|
+    max ||= min + 1
     match do |actual|
       original_timeout = Watir.default_timeout
-      Watir.default_timeout = timeout
+      Watir.default_timeout = max
       begin
         start_time = ::Time.now
         actual.call
         @time_difference = ::Time.now - start_time
-        @time_difference < timeout
+        @time_difference > min && @time_difference < max
       ensure
         Watir.default_timeout = original_timeout
       end
     end
     failure_message_when_negated do
-      "expected action to take more than provided timeout (#{timeout} seconds), " \
+      "expected action to take less than #{min} seconds or more than #{max} seconds, " \
       "instead it took #{@time_difference} seconds"
     end
     failure_message do
-      "expected action to take less than provided timeout (#{timeout} seconds), " \
+      "expected action to take more than #{min} seconds and less than #{max} seconds, " \
       "instead it took #{@time_difference} seconds"
     end
@@ -147,7 +166,7 @@ if defined?(RSpec)
   RSpec::Matchers.define :exist do |*args|
     match do |actual|
-      actual.exists?(*args)
+      actual.exist?(*args)
     end
     failure_message do |obj|

data/spec/watirspec/user_editable_spec.rb CHANGED Viewed

@@ -5,7 +5,7 @@ describe Watir::UserEditable do
     browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
   end
-  not_compliant_on :safari do
+  bug 'incorrectly clears first', :safari do
     describe '#append' do
       it 'appends the text to the text field' do
         browser.text_field(name: 'new_user_occupation').append(' Append This')