watir 6.16.5 → 6.17.0

data/spec/watirspec/elements/button_spec.rb

@@ -37,6 +37,8 @@ describe 'Button' do
       expect(browser.button(text: /Button 2/)).to exist
       expect(browser.button(value: 'Button 2')).to exist
       expect(browser.button(value: /Button 2/)).to exist
+      expect(browser.button(value: 'Button 4 With Child Text')).to exist
+      expect(browser.button(value: /Button 4 With Child Text/)).to exist
     end
 
     it 'returns true if the button exists (how = :caption)' do

data/spec/watirspec/elements/buttons_spec.rb

@@ -13,7 +13,7 @@ describe 'Buttons' do
 
   describe '#length' do
     it 'returns the number of buttons' do
-      expect(browser.buttons.length).to eq 10
+      expect(browser.buttons.length).to eq 11
     end
   end
 

data/spec/watirspec/elements/checkbox_spec.rb

@@ -39,12 +39,16 @@ describe 'CheckBox' do
         expect {
           expect(browser.checkbox(label: /this will not match/)).to exist
         }.to_not have_deprecated_text_regexp
+      end
 
-        expect(browser.checkbox(label: /some visible some hidden/)).to_not exist
+      bug 'Safari is not filtering out hidden text', :safari do
+        it 'handles text_regexp deprecation in spite of hidden text' do
+          expect(browser.checkbox(label: /some visible some hidden/)).to_not exist
 
-        expect {
-          expect(browser.checkbox(label: /some visible$/)).to exist
-        }.to have_deprecated_text_regexp
+          expect {
+            expect(browser.checkbox(label: /some visible$/)).to exist
+          }.to have_deprecated_text_regexp
+        end
       end
     end
 

data/spec/watirspec/elements/date_field_spec.rb

@@ -15,17 +15,24 @@ describe 'DateField' do
       expect(browser.date_field(text: '')).to exist
       expect(browser.date_field(text: //)).to exist
       expect(browser.date_field(index: 0)).to exist
-      expect(browser.date_field(xpath: "//input[@id='html5_date']")).to exist
       expect(browser.date_field(label: 'HTML5 Date')).to exist
       expect(browser.date_field(label: /Date$/)).to exist
     end
 
+    bug 'Safari does not recognize date type', :safari do
+      it 'returns true when using xpath' do
+        expect(browser.date_field(xpath: "//input[@id='html5_date']")).to exist
+      end
+    end
+
     it 'returns the date field if given no args' do
       expect(browser.date_field).to exist
     end
 
-    it 'respects date fields types' do
-      expect(browser.date_field.type).to eq('date')
+    bug 'Safari does not recognize date type', :safari do
+      it 'respects date fields types' do
+        expect(browser.date_field.type).to eq('date')
+      end
     end
 
     it 'returns false if the element does not exist' do
@@ -71,13 +78,15 @@ describe 'DateField' do
     end
   end
 
-  describe '#type' do
-    it 'returns the type attribute if the date field exists' do
-      expect(browser.date_field(id: 'html5_date').type).to eq 'date'
-    end
+  bug 'Safari does not recognize date type', :safari do
+    describe '#type' do
+      it 'returns the type attribute if the date field exists' do
+        expect(browser.date_field(id: 'html5_date').type).to eq 'date'
+      end
 
-    it "raises UnknownObjectException if the date field doesn't exist" do
-      expect { browser.date_field(index: 1337).type }.to raise_unknown_object_exception
+      it "raises UnknownObjectException if the date field doesn't exist" do
+        expect { browser.date_field(index: 1337).type }.to raise_unknown_object_exception
+      end
     end
   end
 

data/spec/watirspec/elements/date_time_field_spec.rb

@@ -16,8 +16,7 @@ describe 'DateTimeField' do
       expect(browser.date_time_field(text: //)).to exist
       expect(browser.date_time_field(index: 0)).to exist
 
-      # Firefox validates attribute "type" as "text" not "datetime-local"
-      not_compliant_on :firefox do
+      bug 'https://github.com/mozilla/geckodriver/issues/1469', :firefox, :safari do
         expect(browser.date_time_field(xpath: "//input[@id='html5_datetime-local']")).to exist
       end
 
@@ -29,7 +28,7 @@ describe 'DateTimeField' do
       expect(browser.date_time_field).to exist
     end
 
-    bug 'https://bugzilla.mozilla.org/show_bug.cgi?id=1424984', :firefox do
+    bug 'https://github.com/mozilla/geckodriver/issues/1469', :firefox, :safari do
       it 'respects date-time fields types' do
         expect(browser.date_time_field.type).to eq('datetime-local')
       end
@@ -79,7 +78,7 @@ describe 'DateTimeField' do
   end
 
   describe '#type' do
-    bug 'https://bugzilla.mozilla.org/show_bug.cgi?id=1424984', :firefox do
+    bug 'https://github.com/mozilla/geckodriver/issues/1469', :firefox, :safari do
       it 'returns the type attribute if the date-time field exists' do
         expect(browser.date_time_field(id: 'html5_datetime-local').type).to eq 'datetime-local'
       end

data/spec/watirspec/elements/div_spec.rb

@@ -97,7 +97,7 @@ describe 'Div' do
       expect(browser.div(index: 0).text.strip).to eq ''
     end
 
-    not_compliant_on :safari do
+    bug 'Safari is not filtering out hidden text', :safari do
       it 'returns an empty string if the div is hidden' do
         expect(browser.div(id: 'hidden').text).to eq ''
       end
@@ -137,8 +137,10 @@ describe 'Div' do
       end
 
       not_compliant_on :watigiri do
-        it 'throws deprecation when no longer matched by text content' do
-          expect { browser.div(text: /some visible$/).locate }.to have_deprecated_text_regexp
+        bug 'Safari is not filtering out hidden text', :safari do
+          it 'throws deprecation when no longer matched by text content' do
+            expect { browser.div(text: /some visible$/).locate }.to have_deprecated_text_regexp
+          end
         end
       end
 
@@ -148,77 +150,83 @@ describe 'Div' do
         end
       end
 
-      # Note: This will work after:text_regexp deprecation removed
       not_compliant_on :watigiri do
-        it 'does not locate entire content with regular expressions' do
-          expect(browser.div(text: /some visible some hidden/)).to_not exist
+        bug 'Safari is not filtering out hidden text', :safari do
+          it 'does not locate entire content with regular expressions' do
+            expect(browser.div(text: /some visible some hidden/)).to_not exist
+          end
         end
       end
     end
   end
 
   # Manipulation methods
-  not_compliant_on :headless do
-    describe '#click' do
-      it 'fires events when clicked' do
-        expect(browser.div(id: 'best_language').text).to_not eq 'Ruby!'
-        browser.div(id: 'best_language').click
-        expect(browser.div(id: 'best_language').text).to eq 'Ruby!'
-      end
+  describe '#click' do
+    it 'fires events when clicked' do
+      expect(browser.div(id: 'best_language').text).to_not eq 'Ruby!'
 
-      it 'raises UnknownObjectException if the element does not exist' do
-        expect { browser.div(id: 'no_such_id').click }.to raise_unknown_object_exception
-        expect { browser.div(title: 'no_such_title').click }.to raise_unknown_object_exception
-        expect { browser.div(index: 1337).click }.to raise_unknown_object_exception
-        expect { browser.div(xpath: "//div[@id='no_such_id']").click }.to raise_unknown_object_exception
-      end
+      div = browser.div(id: 'best_language')
+      div.scroll.to
+      div.click
+      expect(browser.div(id: 'best_language').text).to eq 'Ruby!'
+    end
 
-      it 'includes custom message if element with a custom attribute does not exist' do
-        message = /Watir treated \[\"custom_attribute\"\] as a non-HTML compliant attribute, ensure that was intended/
-        expect { browser.div(custom_attribute: 'not_there').click }.to raise_unknown_object_exception(message)
-      end
+    it 'raises UnknownObjectException if the element does not exist' do
+      expect { browser.div(id: 'no_such_id').click }.to raise_unknown_object_exception
+      expect { browser.div(title: 'no_such_title').click }.to raise_unknown_object_exception
+      expect { browser.div(index: 1337).click }.to raise_unknown_object_exception
+      expect { browser.div(xpath: "//div[@id='no_such_id']").click }.to raise_unknown_object_exception
     end
 
-    describe '#click!' do
-      it 'fires events when clicked' do
-        expect(browser.div(id: 'best_language').text).to_not eq 'Ruby!'
-        browser.div(id: 'best_language').click!
-        expect(browser.div(id: 'best_language').text).to eq 'Ruby!'
-      end
+    it 'includes custom message if element with a custom attribute does not exist' do
+      message = /Watir treated \["custom_attribute"\] as a non-HTML compliant attribute, ensure that was intended/
+      expect { browser.div(custom_attribute: 'not_there').click }.to raise_unknown_object_exception(message)
+    end
+  end
 
-      it 'raises UnknownObjectException if the element does not exist' do
-        expect { browser.div(id: 'no_such_id').click! }.to raise_unknown_object_exception
-        expect { browser.div(title: 'no_such_title').click! }.to raise_unknown_object_exception
-        expect { browser.div(index: 1337).click! }.to raise_unknown_object_exception
-        expect { browser.div(xpath: "//div[@id='no_such_id']").click! }.to raise_unknown_object_exception
-      end
+  describe '#click!' do
+    it 'fires events when clicked' do
+      expect(browser.div(id: 'best_language').text).to_not eq 'Ruby!'
+      browser.div(id: 'best_language').click!
+      expect(browser.div(id: 'best_language').text).to eq 'Ruby!'
+    end
+
+    it 'raises UnknownObjectException if the element does not exist' do
+      expect { browser.div(id: 'no_such_id').click! }.to raise_unknown_object_exception
+      expect { browser.div(title: 'no_such_title').click! }.to raise_unknown_object_exception
+      expect { browser.div(index: 1337).click! }.to raise_unknown_object_exception
+      expect { browser.div(xpath: "//div[@id='no_such_id']").click! }.to raise_unknown_object_exception
     end
   end
 
-  not_compliant_on :safari do
-    bug 'MoveTargetOutOfBoundsError', :firefox do
-      describe '#double_click' do
-        it 'fires the ondblclick event' do
-          browser.div(id: 'html_test').double_click
-          expect(messages).to include('double clicked')
-        end
+  bug 'command correctly received, but action not taken', :safari, :w3c do
+    describe '#double_click' do
+      it 'fires the ondblclick event' do
+        div = browser.div(id: 'html_test')
+        div.scroll.to
+        div.double_click
+        expect(messages).to include('double clicked')
       end
+    end
 
-      describe '#double_click!' do
-        it 'fires the ondblclick event' do
-          browser.div(id: 'html_test').double_click!
-          expect(messages).to include('double clicked')
-        end
+    describe '#double_click!' do
+      it 'fires the ondblclick event' do
+        browser.div(id: 'html_test').double_click!
+        expect(messages).to include('double clicked')
       end
     end
 
-    not_compliant_on :firefox do
-      describe '#right_click' do
-        it 'fires the oncontextmenu event' do
-          browser.goto(WatirSpec.url_for('right_click.html'))
-          browser.div(id: 'click').right_click
-          expect(messages.first).to eq 'right-clicked'
-        end
+    describe '#right_click' do
+      it 'fires the oncontextmenu event' do
+        browser.goto(WatirSpec.url_for('right_click.html'))
+        browser.div(id: 'click').right_click
+        expect(messages.first).to eq 'right-clicked'
+      end
+
+      it 'accepts modifiers' do
+        browser.goto(WatirSpec.url_for('right_click.html'))
+        browser.div(id: 'click-logger').right_click(:control, :alt)
+        expect(event_log.first).to eq('control=true alt=true')
       end
     end
   end

data/spec/watirspec/elements/element_spec.rb

@@ -104,24 +104,30 @@ describe 'Element' do
 
       expect(browser.element(visible_text: 'all visible')).to exist
       expect(browser.element(visible_text: /all visible/)).to exist
-      expect(browser.element(visible_text: 'some visible')).to exist
       expect(browser.element(visible_text: /some visible/)).to exist
-      expect(browser.element(visible_text: 'none visible')).not_to exist
-      expect(browser.element(visible_text: /none visible/)).not_to exist
-
       expect(browser.element(visible_text: 'Link 2', class: 'external')).to exist
       expect(browser.element(visible_text: /Link 2/, class: 'external')).to exist
     end
 
+    bug 'Safari is not filtering out hidden text', :safari do
+      it 'finds elements by visible text in spite of hidden text' do
+        browser.goto WatirSpec.url_for('non_control_elements.html')
+
+        expect(browser.element(visible_text: 'some visible')).to exist
+        expect(browser.element(visible_text: 'none visible')).not_to exist
+        expect(browser.element(visible_text: /none visible/)).not_to exist
+      end
+    end
+
     it 'raises exception unless value is a String or a RegExp' do
       browser.goto WatirSpec.url_for('non_control_elements.html')
-      msg = /expected one of \[String, Regexp\], got 7\:(Fixnum|Integer)/
+      msg = /expected one of \[String, Regexp\], got 7:Integer/
       expect { browser.element(visible_text: 7).exists? }.to raise_exception(TypeError, msg)
     end
 
     it 'raises exception unless key is valid' do
       browser.goto WatirSpec.url_for('non_control_elements.html')
-      msg = /Unable to build XPath using 7:(Fixnum|Integer)/
+      msg = /Unable to build XPath using 7:Integer/
       expect { browser.element(7 => /foo/).exists? }.to raise_exception(Watir::Exception::Error, msg)
     end
   end
@@ -225,32 +231,29 @@ describe 'Element' do
 
   describe '#visible?' do
     it 'returns true if the element is visible' do
-      msg = /WARN Watir \[\"visible_element\"\]/
+      msg = /WARN Watir \["visible_element"\]/
       expect {
         expect(browser.text_field(id: 'new_user_email')).to be_visible
       }.to output(msg).to_stdout_from_any_process
     end
 
     it 'raises UnknownObjectException exception if the element does not exist' do
-      msg = /WARN Watir \[\"visible_element\"\]/
+      msg = /WARN Watir \["visible_element"\]/
       expect {
         expect { browser.text_field(id: 'no_such_id').visible? }.to raise_unknown_object_exception
       }.to output(msg).to_stdout_from_any_process
     end
 
-    it 'raises UnknownObjectException exception if the element is stale' do
+    it 'handles staleness' do
       element = browser.text_field(id: 'new_user_email').locate
 
-      browser.refresh
+      allow(element).to receive(:stale?).and_return(true)
 
-      expect(element).to be_stale
-      expect {
-        expect { element.visible? }.to raise_unknown_object_exception
-      }.to have_deprecated_stale_visible
+      expect(element).to be_visible
     end
 
     it "returns true if the element has style='visibility: visible' even if parent has style='visibility: hidden'" do
-      msg = /WARN Watir \[\"visible_element\"\]/
+      msg = /WARN Watir \["visible_element"\]/
       expect {
         expect(browser.div(id: 'visible_child')).to be_visible
       }.to output(msg).to_stdout_from_any_process
@@ -261,7 +264,7 @@ describe 'Element' do
     end
 
     it "returns false if the element has style='display: none;'" do
-      msg = /WARN Watir \[\"visible_element\"\]/
+      msg = /WARN Watir \["visible_element"\]/
       expect {
         expect(browser.div(id: 'changed_language')).to_not be_visible
       }.to output(msg).to_stdout_from_any_process
@@ -295,9 +298,7 @@ describe 'Element' do
       element.cache = wd
 
       browser.refresh
-      expect {
-        expect(element).to_not exist
-      }.to have_deprecated_stale_exists
+      expect(element).to_not exist
     end
   end
 
@@ -306,15 +307,12 @@ describe 'Element' do
       browser.goto WatirSpec.url_for('removed_element.html')
     end
 
-    it 'element from a collection returns false when it becomes stale' do
+    it 'handles staleness in a collection' do
       element = browser.divs(id: 'text').first.locate
 
-      browser.refresh
+      allow(element).to receive(:stale?).and_return(true)
 
-      expect(element).to be_stale
-      expect {
-        expect(element).to_not exist
-      }.to have_deprecated_stale_exists
+      expect(element).to exist
     end
 
     it 'returns false when tag name does not match id' do
@@ -340,36 +338,11 @@ describe 'Element' do
       expect(browser.div(id: 'should-not-exist')).to_not be_present
     end
 
-    it 'returns false if the element is stale' do
-      element = browser.div(id: 'foo').locate
-
-      browser.refresh
-
-      expect(element).to be_stale
-
-      expect {
-        expect(element).to_not be_present
-      }.to have_deprecated_stale_present
-    end
-
-    it 'does not raise staleness deprecation if element no longer exists in DOM' do
-      element = browser.div(id: 'foo').locate
-      browser.goto(WatirSpec.url_for('iframes.html'))
-
-      expect { element.present? }.to_not have_deprecated_stale_present
-    end
-
-    # TODO: Documents Current Behavior, but needs to be refactored/removed
-    it 'returns true the second time if the element is stale' do
+    it 'handles staleness' do
       element = browser.div(id: 'foo').locate
 
-      browser.refresh
-
-      expect(element).to be_stale
+      allow(element).to receive(:stale?).and_return(true)
 
-      expect {
-        expect(element).to_not be_present
-      }.to have_deprecated_stale_present
       expect(element).to be_present
     end
   end
@@ -535,8 +508,8 @@ describe 'Element' do
       expect(events).to eq 10
     end
 
-    bug 'http://code.google.com/p/chromium/issues/detail?id=93879', :chrome do
-      not_compliant_on :safari, :firefox do
+    bug 'http://code.google.com/p/chromium/issues/detail?id=93879', %i[chrome macosx] do
+      bug 'special keys are not working correctly', :safari, :firefox do
         it 'performs key combinations' do
           receiver.send_keys 'foo'
           receiver.send_keys [@c, 'a']
@@ -562,14 +535,14 @@ describe 'Element' do
   end
 
   describe '#click' do
-    bug 'https://github.com/mozilla/geckodriver/issues/1375', :firefox do
-      it 'accepts modifiers' do
-        begin
+    bug 'Element has been located but Safari does not recognize it', :safari do
+      bug 'https://bugs.chromium.org/p/chromedriver/issues/detail?id=2732', :w3c do
+        it 'accepts modifiers' do
           browser.a.click(:shift)
+          browser.wait_until { |b| b.windows.size > 1 }
           expect(browser.windows.size).to eq 2
         ensure
           browser.windows.reject(&:current?).each(&:close)
-          expect(browser.windows.size).to eq 1
         end
       end
     end
@@ -597,12 +570,13 @@ describe 'Element' do
   end
 
   describe '#hover' do
-    not_compliant_on :internet_explorer, :safari do
+    not_compliant_on :internet_explorer do
       it 'should hover over the element' do
         browser.goto WatirSpec.url_for('hover.html')
         link = browser.a
 
         expect(link.style('font-size')).to eq '10px'
+        link.scroll.to
         link.hover
         link.wait_until { |l| l.style('font-size') == '20px' }
         expect(link.style('font-size')).to eq '20px'
@@ -703,19 +677,22 @@ describe 'Element' do
     end
   end
 
-  not_compliant_on %i[remote firefox] do
-    describe '#scroll_into_view' do
-      it 'scrolls element into view' do
-        el = browser.button(name: 'new_user_image')
-        element_center = el.center['y']
+  describe '#scroll_into_view' do
+    it 'scrolls element into view' do
+      initial_size = browser.window.size
+      browser.window.resize_to(initial_size.width, 800)
+
+      el = browser.button(name: 'new_user_image')
+      element_center = el.center['y']
 
-        bottom_viewport_script = 'return window.pageYOffset + window.innerHeight'
-        expect(browser.execute_script(bottom_viewport_script)).to be < element_center
+      bottom_viewport_script = 'return window.pageYOffset + window.innerHeight'
+      expect(browser.execute_script(bottom_viewport_script)).to be < element_center
 
+      expect {
         expect(el.scroll_into_view).to be_a Selenium::WebDriver::Point
+      }.to have_deprecated_scroll_into_view
 
-        expect(browser.execute_script(bottom_viewport_script)).to be > element_center
-      end
+      expect(browser.execute_script(bottom_viewport_script)).to be > element_center
     end
   end
 
@@ -902,31 +879,34 @@ describe 'Element' do
   describe '#obscured?' do
     before { browser.goto WatirSpec.url_for('obscured.html') }
 
-    it 'returns false if element\'s center is not covered' do
+    it 'returns false if element center is not covered' do
       btn = browser.button(id: 'not_obscured')
       expect(btn).not_to be_obscured
       expect { btn.click }.not_to raise_exception
     end
 
-    it 'returns false if element\'s center is covered by its descendant' do
+    it 'returns false if element center is covered by its descendant' do
       btn = browser.button(id: 'has_descendant')
       expect(btn).not_to be_obscured
       expect { btn.click }.not_to raise_exception
     end
 
-    it 'returns true if element\'s center is covered by a non-descendant' do
+    it 'returns true if element center is covered by a non-descendant' do
       btn = browser.button(id: 'obscured')
       expect(btn).to be_obscured
-      not_compliant_on :chrome do
+      not_compliant_on :chrome, :safari do
         expect { btn.click }.to raise_exception(Selenium::WebDriver::Error::ElementClickInterceptedError)
       end
       compliant_on :chrome do
-        expect { btn.click }.to raise_exception(Selenium::WebDriver::Error::UnknownError)
+        expect { btn.click }.to raise_exception(Selenium::WebDriver::Error::ElementClickInterceptedError)
+      end
+      compliant_on :safari do
+        expect { btn.click }.to raise_exception(Selenium::WebDriver::Error::WebDriverError)
       end
     end
 
     not_compliant_on %i[firefox appveyor] do
-      it 'returns false if element\'s center is surrounded by non-descendants' do
+      it 'returns false if element center is surrounded by non-descendants' do
         btn = browser.button(id: 'surrounded')
         expect(btn).not_to be_obscured
         expect { btn.click }.not_to raise_exception
@@ -945,10 +925,12 @@ describe 'Element' do
       expect { div.click }.not_to raise_exception
     end
 
-    it 'returns true if element cannot be scrolled into view' do
-      btn = browser.button(id: 'off_screen')
-      expect(btn).to be_obscured
-      expect { btn.click }.to raise_unknown_object_exception
+    bug 'Safari is throwing click intercepted here', :safari do
+      it 'returns true if element cannot be scrolled into view' do
+        btn = browser.button(id: 'off_screen')
+        expect(btn).to be_obscured
+        expect { btn.click }.to raise_unknown_object_exception
+      end
     end
 
     it 'returns true if element is hidden' do