watir 6.19.1 → 7.0.0.beta1

data/spec/watirspec/elements/div_spec.rb

@@ -19,6 +19,9 @@ describe 'Div' do
       expect(browser.div(xpath: "//div[@id='header']")).to exist
       expect(browser.div(custom_attribute: 'custom')).to exist
       expect(browser.div(custom_attribute: /custom/)).to exist
+      expect(browser.div(text: /some visible/)).to exist
+      expect(browser.div(text: /some (visible|Jeff)/)).to exist
+      expect(browser.div(text: /none visible/)).to exist
     end
 
     it 'returns the first div if given no args' do
@@ -34,6 +37,7 @@ describe 'Div' do
       expect(browser.div(text: /no_such_text/)).to_not exist
       expect(browser.div(class: 'no_such_class')).to_not exist
       expect(browser.div(class: /no_such_class/)).to_not exist
+      expect(browser.div(text: /some visible some hidden/)).to exist
       expect(browser.div(index: 1337)).to_not exist
       expect(browser.div(xpath: "//div[@id='no_such_id']")).to_not exist
     end
@@ -126,40 +130,6 @@ describe 'Div' do
     end
   end
 
-  describe 'Deprecation Warnings' do
-    describe 'text locator with RegExp values' do
-      it 'does not throw deprecation when still matched by text content' do
-        expect { browser.div(text: /some visible/).locate }.not_to have_deprecated_text_regexp
-      end
-
-      it 'does not throw deprecation with complex regexp matched by text content' do
-        expect { browser.div(text: /some (in|)visible/).locate }.not_to have_deprecated_text_regexp
-      end
-
-      not_compliant_on :watigiri do
-        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
-
-      not_compliant_on :watigiri do
-        it 'does not throw deprecation when element does not exist' do
-          expect { browser.div(text: /definitely not there/).locate }.not_to have_deprecated_text_regexp
-        end
-      end
-
-      not_compliant_on :watigiri do
-        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
   describe '#click' do
     it 'fires events when clicked' do

data/spec/watirspec/elements/divs_spec.rb

@@ -13,7 +13,7 @@ describe 'Divs' do
 
   describe '#length' do
     it 'returns the number of divs' do
-      expect(browser.divs.length).to eq 16
+      expect(browser.divs.length).to eq 20
     end
   end
 
@@ -29,7 +29,7 @@ describe 'Divs' do
     end
 
     it 'returns an array of divs with a given range including negative values' do
-      divs = browser.divs[11..-3]
+      divs = browser.divs[11..-7]
       ids = divs.map(&:id)
       expect(ids).to eq %w[messages ins_tag_test del_tag_test]
     end

data/spec/watirspec/elements/element_spec.rb

@@ -20,12 +20,6 @@ describe 'Element' do
       expect { Watir::Element.new(container, 1, 2, 3, 4) }.to raise_error(ArgumentError)
       expect { Watir::Element.new(container, 'foo') }.to raise_error(ArgumentError)
     end
-
-    it 'throws deprecation warning when combining element locator with other locators' do
-      element = double Selenium::WebDriver::Element
-      allow(element).to receive(:enabled?).and_return(true)
-      expect { browser.text_field(class_name: 'name', index: 1, element: element) }.to have_deprecated_element_cache
-    end
   end
 
   describe '#element_call' do
@@ -40,13 +34,11 @@ describe 'Element' do
       expect { element.text }.to_not raise_error
     end
 
-    compliant_on :relaxed_locate do
-      it 'relocates stale element when taking an action on it' do
-        browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-        element = browser.text_field(id: 'new_user_first_name').locate
-        browser.refresh
-        expect { element.click }.not_to raise_exception
-      end
+    it 'relocates stale element when taking an action on it' do
+      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
+      element = browser.text_field(id: 'new_user_first_name').locate
+      browser.refresh
+      expect { element.click }.not_to raise_exception
     end
   end
 
@@ -229,56 +221,6 @@ describe 'Element' do
     end
   end
 
-  describe '#visible?' do
-    it 'returns true if the element is visible' do
-      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"\]/
-      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 'handles staleness' do
-      element = browser.text_field(id: 'new_user_email').locate
-
-      allow(element).to receive(:stale?).and_return(true)
-
-      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"\]/
-      expect {
-        expect(browser.div(id: 'visible_child')).to be_visible
-      }.to output(msg).to_stdout_from_any_process
-    end
-
-    it "returns false if the element is input element where type eq 'hidden'" do
-      expect(browser.hidden(id: 'new_user_interests_dolls')).to_not be_visible
-    end
-
-    it "returns false if the element has style='display: none;'" do
-      msg = /WARN Watir \["visible_element"\]/
-      expect {
-        expect(browser.div(id: 'changed_language')).to_not be_visible
-      }.to output(msg).to_stdout_from_any_process
-    end
-
-    it "returns false if the element has style='visibility: hidden;" do
-      expect { expect(browser.div(id: 'wants_newsletter')).to_not be_visible }
-    end
-
-    it 'returns false if one of the parent elements is hidden' do
-      expect { expect(browser.div(id: 'hidden_parent')).to_not be_visible }
-    end
-  end
-
   describe '#cache=' do
     it 'bypasses selector location' do
       browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
@@ -307,14 +249,36 @@ describe 'Element' do
       browser.goto WatirSpec.url_for('removed_element.html')
     end
 
-    it 'handles staleness in a collection' do
+    it 'element from a collection is re-looked up after it becomes stale' do
       element = browser.divs(id: 'text').first.locate
 
-      allow(element).to receive(:stale?).and_return(true)
+      browser.refresh
 
+      expect(element).to be_stale
       expect(element).to exist
     end
 
+    it 'element from a selenium element throws an exception when relocated' do
+      div = browser.div.locate
+      element = browser.element(element: div.wd)
+
+      browser.refresh
+      expect(element).to be_stale
+
+      msg = 'Can not relocate a Watir element initialized by a Selenium element'
+      expect { element.exists? }.to raise_exception(Watir::Exception::LocatorException, msg)
+    end
+
+    it 'element from a selenium element with other locators throws an exception' do
+      div = browser.div.locate
+      element = browser.element(element: div.wd, id: 'foo')
+
+      browser.refresh
+
+      msg = 'Can not relocate a Watir element initialized by a Selenium element'
+      expect { element.exists? }.to raise_exception(Watir::Exception::LocatorException, msg)
+    end
+
     it 'returns false when tag name does not match id' do
       watir_element = browser.span(id: 'text')
       expect(watir_element).to_not exist
@@ -374,6 +338,15 @@ describe 'Element' do
       expect(element).to be_stale
     end
 
+    it 'returns true the second time if the element is stale' do
+      element = browser.div.locate
+
+      browser.refresh
+
+      expect(element).to be_stale
+      expect(element).to be_stale
+    end
+
     it 'returns false if the element is not stale' do
       element = browser.button(name: 'new_user_submit_disabled').locate
 
@@ -677,25 +650,6 @@ describe 'Element' do
     end
   end
 
-  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
-
-      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
-  end
-
   describe '#location' do
     it 'returns coordinates for element location' do
       location = browser.button(name: 'new_user_image').location

data/spec/watirspec/elements/form_spec.rb

@@ -59,10 +59,8 @@ describe 'Form' do
       expect(messages[0]).to eq 'submit'
     end
 
-    compliant_on :relaxed_locate do
-      it 'times out when submitting an element that is not displayed' do
-        expect { browser.form(name: 'no').submit }.to raise_unknown_object_exception
-      end
+    it 'times out when submitting an element that is not displayed' do
+      expect { browser.form(name: 'no').submit }.to raise_unknown_object_exception
     end
   end
 end

data/spec/watirspec/elements/links_spec.rb

@@ -43,7 +43,7 @@ describe 'Links' do
   describe 'visible text' do
     it 'finds links by visible text' do
       browser.goto WatirSpec.url_for('non_control_elements.html')
-      container = browser.div(id: 'visible_text')
+      container = browser.div(id: 'visible_link')
       expect(container.links(visible_text: 'all visible').count).to eq(1)
       expect(container.links(visible_text: /all visible/).count).to eq(1)
       expect(container.links(visible_text: /some visible/).count).to eq(1)
@@ -54,9 +54,9 @@ describe 'Links' do
         browser.goto WatirSpec.url_for('non_control_elements.html')
         container = browser.div(id: 'visible_text')
 
-        expect(container.links(visible_text: 'some visible').count).to eq(1)
-        expect(container.links(visible_text: 'none visible').count).to eq(0)
-        expect(container.links(visible_text: /none visible/).count).to eq(0)
+        expect(container.divs(visible_text: 'some visible').count).to eq(1)
+        expect(container.divs(visible_text: 'none visible').count).to eq(0)
+        expect(container.divs(visible_text: /none visible/).count).to eq(0)
       end
     end
   end

data/spec/watirspec/elements/select_list_spec.rb

@@ -254,10 +254,8 @@ describe 'SelectList' do
 
       it 'selects an option with a Regexp' do
         browser.select_list(name: 'new_user_languages').clear
-        expect {
-          browser.select_list(name: 'new_user_languages').select(/1|3/)
-        }.to have_deprecated_select_by
-        expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq %w[Danish NO]
+        browser.select_list(name: 'new_user_languages').select(/2|3/)
+        expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq %w[EN]
       end
     end
 
@@ -329,13 +327,11 @@ describe 'SelectList' do
       browser.select_list(id: 'single-quote').select("'foo'")
     end
 
-    compliant_on :relaxed_locate do
-      it 'waits to select an option' do
-        browser.goto WatirSpec.url_for('wait.html')
-        browser.a(id: 'add_select').click
-        select_list = browser.select_list(id: 'languages')
-        expect { select_list.select('No') }.to wait_and_raise_no_value_found_exception
-      end
+    it 'waits to select an option' do
+      browser.goto WatirSpec.url_for('wait.html')
+      browser.a(id: 'add_select').click
+      select_list = browser.select_list(id: 'languages')
+      expect { select_list.select('No') }.to wait_and_raise_no_value_found_exception
     end
 
     it "raises NoValueFoundException if the option doesn't exist" do
@@ -554,101 +550,4 @@ describe 'SelectList' do
       end
     end
   end
-
-  describe '#select_all' do
-    it 'selects multiple options based on text' do
-      browser.select_list(name: 'new_user_languages').clear
-      expect {
-        browser.select_list(name: 'new_user_languages').select_all(/ish/)
-      }.to have_deprecated_select_all
-      list = %w[Danish EN Swedish]
-      expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq list
-    end
-
-    it 'selects multiple options based on labels' do
-      browser.select_list(name: 'new_user_languages').clear
-      expect {
-        browser.select_list(name: 'new_user_languages').select_all(/NO|EN/)
-      }.to have_deprecated_select_all
-      list = %w[EN NO]
-      expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq list
-    end
-
-    it 'selects all options in an Array' do
-      browser.select_list(name: 'new_user_languages').clear
-      expect {
-        browser.select_list(name: 'new_user_languages').select_all([/ish/, /Latin/])
-      }.to have_deprecated_select_all
-      list = ['Danish', 'EN', 'Swedish', 'Azeri - Latin', 'Latin']
-      expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq list
-    end
-
-    it 'selects all options in a parameter list' do
-      browser.select_list(name: 'new_user_languages').clear
-      expect {
-        browser.select_list(name: 'new_user_languages').select_all(/ish/, /Latin/)
-      }.to have_deprecated_select_all
-      list = ['Danish', 'EN', 'Swedish', 'Azeri - Latin', 'Latin']
-      expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq list
-    end
-
-    it 'returns the first matching value if there are multiple matches' do
-      expect {
-        expect(browser.select_list(name: 'new_user_languages').select_all(/ish/)).to eq 'Danish'
-      }.to have_deprecated_select_all
-    end
-  end
-
-  describe '#select_all!' do
-    it 'selects multiple options based on value' do
-      browser.select_list(name: 'new_user_languages').clear
-      expect {
-        browser.select_list(name: 'new_user_languages').select_all!(/\d+/)
-      }.to have_deprecated_select_all
-      list = %w[Danish EN NO Russian]
-      expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq list
-    end
-
-    it 'selects multiple options based on text' do
-      browser.select_list(name: 'new_user_languages').clear
-      expect {
-        browser.select_list(name: 'new_user_languages').select_all!(/ish/)
-      }.to have_deprecated_select_all
-      list = %w[Danish EN Swedish]
-      expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq list
-    end
-
-    it 'selects multiple options based on labels' do
-      browser.select_list(name: 'new_user_languages').clear
-      expect {
-        browser.select_list(name: 'new_user_languages').select_all!(/NO|EN/)
-      }.to have_deprecated_select_all
-      list = %w[EN NO]
-      expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq list
-    end
-
-    it 'selects all options in an Array' do
-      browser.select_list(name: 'new_user_languages').clear
-      expect {
-        browser.select_list(name: 'new_user_languages').select_all!([/ish/, /Latin/])
-      }.to have_deprecated_select_all
-      list = ['Danish', 'EN', 'Swedish', 'Azeri - Latin', 'Latin']
-      expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq list
-    end
-
-    it 'selects all options in a parameter list' do
-      browser.select_list(name: 'new_user_languages').clear
-      expect {
-        browser.select_list(name: 'new_user_languages').select_all!(/ish/, /Latin/)
-      }.to have_deprecated_select_all
-      list = ['Danish', 'EN', 'Swedish', 'Azeri - Latin', 'Latin']
-      expect(browser.select_list(name: 'new_user_languages').selected_options.map(&:text)).to eq list
-    end
-
-    it 'returns the first matching value if there are multiple matches' do
-      expect {
-        expect(browser.select_list(name: 'new_user_languages').select_all!(/ish/)).to eq 'Danish'
-      }.to have_deprecated_select_all
-    end
-  end
 end

data/spec/watirspec/elements/span_spec.rb

@@ -17,8 +17,8 @@ describe 'Span' do
       expect(browser.span(xpath: "//span[@id='lead']")).to exist
     end
 
-    it 'visible text is found by regular expression with text locator' do
-      expect(browser.span(text: /Dubito, ergo cogito, ergo sum/)).to exist
+    it 'visible text is found by regular expression with visible text locator' do
+      expect(browser.span(visible_text: /Dubito, ergo cogito, ergo sum/)).to exist
     end
 
     it 'returns the first span if given no args' do

data/spec/watirspec/elements/spans_spec.rb

@@ -13,7 +13,7 @@ describe 'Spans' do
 
   describe '#length' do
     it 'returns the number of spans' do
-      expect(browser.spans.length).to eq 7
+      expect(browser.spans.length).to eq 8
     end
   end
 

data/spec/watirspec/elements/strong_spec.rb

@@ -18,7 +18,7 @@ describe 'Strong' do
     end
 
     it 'visible text is found by regular expression with text locator' do
-      expect(browser.strong(text: /Dubito, ergo cogito, ergo sum/)).to exist
+      expect(browser.strong(visible_text: /Dubito, ergo cogito, ergo sum/)).to exist
     end
 
     it 'returns the first strong if given no args' do

data/spec/watirspec/html/non_control_elements.html

@@ -131,10 +131,15 @@
       <del class="footer" onclick="this.innerHTML = 'This is a del with text set by Javascript.'">This is a del.</del>
     </div>
     <div custom-attribute=custom>Custom</div>
+    <div id="visible_link">
+      <a id="all_visible_link">all visible</a>
+      <a id="some_visible_link">some visible<span style="display:none;"> some hidden</span></a>
+      <a id="no_visible_link" style="display:none;">none visible</a>
+    </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 id="all_visible_text">all visible</div>
+      <div id="some_visible_text">some visible<span style="display:none;"> some hidden</span></div>
+      <div id="no_visible_text" style="display:none;">none visible</div>
     </div>
   </body>
 </html>