watir 6.16.2 → 6.18.0

data/spec/watirspec/elements/text_field_spec.rb

@@ -25,15 +25,19 @@ describe 'TextField' do
       expect(browser.text_field(label: /Without for/)).to exist
       expect(browser.text_field(label: 'With hidden text')).to exist
       expect(browser.text_field(label: 'With text')).not_to exist
-      expect(browser.text_field(visible_label: 'With hidden text')).not_to exist
-      expect(browser.text_field(visible_label: 'With text')).to exist
 
       # These will work after text is deprecated for visible_text
       # expect(browser.text_field(label: /With hidden text/)).to exist
       # expect(browser.text_field(label: /With text/)).not_to exist
+    end
 
-      expect(browser.text_field(visible_label: /With text/)).to exist
-      expect(browser.text_field(visible_label: /With hidden text/)).not_to exist
+    bug 'Safari is not filtering out hidden text', :safari do
+      it 'returns true in spite of hidden text' do
+        expect(browser.text_field(visible_label: 'With hidden text')).not_to exist
+        expect(browser.text_field(visible_label: 'With text')).to exist
+        expect(browser.text_field(visible_label: /With text/)).to exist
+        expect(browser.text_field(visible_label: /With hidden text/)).not_to exist
+      end
     end
 
     it 'locates value of text_field using text locators' do

data/spec/watirspec/elements/tr_spec.rb

@@ -29,15 +29,6 @@ describe 'TableRow' do
     end
   end
 
-  describe '#click' do
-    not_compliant_on :internet_explorer, :chrome, :firefox do
-      it "fires the row's onclick event" do
-        browser.tr(id: 'inner_first').click
-        expect(messages).to include('tr')
-      end
-    end
-  end
-
   bug 'Safari does not strip text', :safari do
     describe '#[]' do
       let(:table) { browser.table(id: 'outer') }

data/spec/watirspec/html/forms_with_input_elements.html

@@ -133,6 +133,7 @@
             <input type="BuTTon" name="new_user_button_preview" id="new_user_button_preview" alt="Create a new user" value="Preview" data-locator="preview"/>
             <button name="new_user_button_2" type="submit" value="button_2" data-locator="Benjamin">Button 2</button>
             <button name="new_user_button_3" value="button_3" data-locator="No Type">Button 3</button>
+            <button name="new_user_button_4" value="button_4" data-locator="child text">  Button 4  <span>  With  Child  Text  </span>  </button>
             <input type="image" class="image" name="new_user_image" src="images/button.png" alt="Submittable button" data-locator="submittable button"/>
             <input type="submit" name="new_user_submit_disabled" id="disabled_button" value="Disabled" disabled="disabled" data-locator="disabled" />
             <input type="checkbox" name="new_user_submit_disabled" id="toggle_button_checkbox" onclick="var elem = document.getElementById('disabled_button'); elem.disabled = !elem.disabled" />

data/spec/watirspec/html/iframes.html

@@ -8,5 +8,8 @@
         <h1>Iframes</h1>
         <iframe src="iframe_1.html" id="iframe_1" name="iframe1" class="half"></iframe>
         <iframe src="frame_2.html" id="iframe_2" name="iframe2" class="half"></iframe>
+    <div class="wrapper">
+        <iframe src="nested_elements.html" id="iframe_3" name="iframe3"></iframe>
+    </div>
     </body>
 </html>

data/spec/watirspec/html/non_control_elements.html

@@ -132,9 +132,9 @@
     </div>
     <div custom-attribute=custom>Custom</div>
     <div id="visible_text">
-			<a id="all_visible_text">all visible</a>
-			<a id="some_visible_text">some visible<span style="display:none;"> some hidden</span></a>
-			<a id="no_visible_text" style="display:none;">none visible</a>
-		</div>
+        <a id="all_visible_text">all visible</a>
+        <a id="some_visible_text">some visible<span style="display:none;"> some hidden</span></a>
+        <a id="no_visible_text" style="display:none;">none visible</a>
+    </div>
   </body>
 </html>

data/spec/watirspec/html/right_click.html

@@ -3,9 +3,21 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>Right Click Test</title>
     <script src="javascript/helpers.js" type="text/javascript" charset="utf-8"></script>
+    <script src="javascript/jquery-1.7.1.min.js" type="text/javascript" charset="utf-8"></script>
   </head>
+  <script>
+    $(document).ready(function() {
+      $(document).on("contextmenu", "#click-logger", function(evt){
+        $("#log").append("<p>control=" + evt.ctrlKey + " alt=" + evt.altKey + "</p>");
+        return false;
+      });
+    });
+  </script>
   <body>
     <div id="messages"></div>
     <div id="click" oncontextmenu='WatirSpec.addMessage("right-clicked"); return false'>Right click!</div>
+    <br />
+    <div id="click-logger">Right click with modifiers!</div>
+    <div id="log"></div>
   </body>
 </html>

data/spec/watirspec/html/wait.html

@@ -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

@@ -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

@@ -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/support/rspec_matchers.rb

@@ -8,13 +8,16 @@ 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
@@ -62,10 +65,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 +91,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 +119,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 +151,7 @@ if defined?(RSpec)
 
   RSpec::Matchers.define :exist do |*args|
     match do |actual|
-      actual.exists?(*args)
+      actual.exist?(*args)
     end
 
     failure_message do |obj|