watir 6.17.0 → 7.0.0.beta2

data/spec/watirspec/cookies_spec.rb

@@ -4,7 +4,7 @@ describe 'Browser#cookies' do
   after { browser.cookies.clear }
 
   it 'gets an empty list of cookies' do
-    browser.goto WatirSpec.url_for 'collections.html' # no cookie set.
+    browser.goto WatirSpec.url_for 'index.html'
     expect(browser.cookies.to_a).to eq []
   end
 
@@ -41,94 +41,89 @@ describe 'Browser#cookies' do
     end
   end
 
-  not_compliant_on :internet_explorer do
-    it 'adds a cookie without options' do
-      browser.goto set_cookie_url
-      verify_cookies_count 1
+  it 'adds a cookie without options' do
+    browser.goto WatirSpec.url_for 'index.html'
+    verify_cookies_count 0
 
-      browser.cookies.add 'foo', 'bar'
-      verify_cookies_count 2
-    end
+    browser.cookies.add 'foo', 'bar'
+    verify_cookies_count 1
+  end
 
-    it 'adds a cookie with a string expires value' do
-      browser.goto set_cookie_url
-      verify_cookies_count 1
+  it 'adds a cookie with a string expires value' do
+    browser.goto WatirSpec.url_for 'index.html'
 
-      expire_time = Time.now + 10_000
+    expire_time = Time.now + 10_000
 
-      browser.cookies.add 'foo', 'bar', expires: expire_time.to_s
+    browser.cookies.add 'foo', 'bar', expires: expire_time.to_s
 
-      cookie = browser.cookies[:foo]
-      expect(cookie[:expires]).to be_kind_of(Time)
-    end
+    cookie = browser.cookies[:foo]
+    expect(cookie[:expires]).to be_kind_of(Time)
   end
 
-  it 'adds a cookie with path' do
-    browser.goto set_cookie_url
+  it 'adds a cookie with path',
+     except: {browser: :ie, reason: 'path contains two slashes'} do
+    browser.goto WatirSpec.url_for 'index.html'
 
     options = {path: '/set_cookie'}
-
     browser.cookies.add 'path', 'b', options
+
+    expect(browser.cookies.to_a).to be_empty
+
+    browser.goto set_cookie_url
     cookie = browser.cookies.to_a.find { |e| e[:name] == 'path' }
 
-    expect(cookie).to_not be_nil
     expect(cookie[:name]).to eq 'path'
     expect(cookie[:value]).to eq 'b'
     expect(cookie[:path]).to eq '/set_cookie'
   end
 
   it 'adds a cookie with expiration' do
-    browser.goto set_cookie_url
+    browser.goto WatirSpec.url_for 'index.html'
 
     expires = Time.now + 10_000
     options = {expires: expires}
 
     browser.cookies.add 'expiration', 'b', options
-    cookie = browser.cookies.to_a.find { |e| e[:name] == 'expiration' }
+    cookie = browser.cookies.to_a.first
 
-    expect(cookie).to_not be_nil
     expect(cookie[:name]).to eq 'expiration'
     expect(cookie[:value]).to eq 'b'
-    # a few ms slack
+
     expect((cookie[:expires]).to_i).to be_within(2).of(expires.to_i)
   end
 
-  bug 'https://bugs.chromium.org/p/chromedriver/issues/detail?id=2727', :chrome, :safari do
-    it 'adds a cookie with security' do
-      browser.goto set_cookie_url
-
-      options = {secure: true}
+  # Pending resolution of https://github.com/w3c/webdriver/issues/1571
+  it 'adding cookie with security does not raise exception but can not be retrieved',
+     except: [{browser: :firefox,
+               reason: 'https://github.com/mozilla/geckodriver/issues/1840'},
+              {browser: %i[chrome edge], platform: :windows}] do
+    browser.goto WatirSpec.url_for 'index.html'
 
-      browser.cookies.add 'secure', 'b', options
-      cookie = browser.cookies.to_a.find { |e| e[:name] == 'secure' }
-      expect(cookie).to_not be_nil
+    options = {secure: true}
 
-      expect(cookie[:name]).to eq 'secure'
-      expect(cookie[:value]).to eq 'b'
-      expect(cookie[:secure]).to be true
-    end
+    browser.cookies.add 'secure', 'b', options
+    cookie = browser.cookies.to_a.find { |e| e[:name] == 'secure' }
+    expect(cookie).to be_nil
   end
 
-  not_compliant_on :internet_explorer do
-    it 'removes a cookie' do
-      browser.goto set_cookie_url
-      verify_cookies_count 1
+  it 'removes a cookie' do
+    browser.goto set_cookie_url
+    verify_cookies_count 1
 
-      browser.cookies.delete 'monster'
-      verify_cookies_count 0
-    end
+    browser.cookies.delete 'monster'
+    verify_cookies_count 0
+  end
 
-    it 'clears all cookies' do
-      browser.goto set_cookie_url
-      browser.cookies.add 'foo', 'bar'
-      verify_cookies_count 2
+  it 'clears all cookies' do
+    browser.goto set_cookie_url
+    browser.cookies.add 'foo', 'bar'
+    verify_cookies_count 2
 
-      browser.cookies.clear
-      verify_cookies_count 0
-    end
+    browser.cookies.clear
+    verify_cookies_count 0
   end
 
-  not_compliant_on :internet_explorer do
+  context 'cookie file' do
     let(:file) { "#{Dir.tmpdir}/cookies" }
 
     before do
@@ -142,7 +137,7 @@ describe 'Browser#cookies' do
       end
     end
 
-    describe '#load' do
+    describe '#load', except: {browser: :ie} do
       it 'loads cookies from file' do
         browser.cookies.clear
         browser.cookies.load file

data/spec/watirspec/drag_and_drop_spec.rb

@@ -1,7 +1,7 @@
 require 'watirspec_helper'
 
 describe 'Element' do
-  context 'drag and drop' do
+  context 'drag and drop', except: {browser: :ie} do
     before { browser.goto WatirSpec.url_for('drag_and_drop.html') }
 
     let(:draggable) { browser.div id: 'draggable' }
@@ -13,12 +13,10 @@ describe 'Element' do
       expect(droppable.text).to include 'Dropped!'
     end
 
-    bug 'Element is getting moved to the wrong spot', :w3c do
-      it 'can drag an element by the given offset' do
-        expect(droppable.text).to include 'Drop here'
-        draggable.drag_and_drop_by 200, 50
-        expect(droppable.text).to include 'Dropped!'
-      end
+    it 'can drag an element by the given offset' do
+      expect(droppable.text).to include 'Drop here'
+      draggable.drag_and_drop_by 200, 50
+      expect(droppable.text).to include 'Dropped!'
     end
   end
 end

data/spec/watirspec/elements/area_spec.rb

@@ -12,11 +12,7 @@ describe 'Area' do
       expect(browser.area(id: /NCE/)).to exist
       expect(browser.area(title: 'Tables')).to exist
       expect(browser.area(title: /Tables/)).to exist
-
-      not_compliant_on :internet_explorer do
-        expect(browser.area(href: 'tables.html')).to exist
-      end
-
+      expect(browser.area(href: 'tables.html')).to exist
       expect(browser.area(href: /tables/)).to exist
 
       expect(browser.area(index: 0)).to exist

data/spec/watirspec/elements/button_spec.rb

@@ -14,9 +14,7 @@ describe 'Button' do
       expect(browser.button(name: /new_user_reset/)).to exist
       expect(browser.button(value: 'Button')).to exist
       expect(browser.button(value: /Button/)).to exist
-      not_compliant_on :internet_explorer do
-        expect(browser.button(src: 'images/button.png')).to exist
-      end
+      expect(browser.button(src: 'images/button.png')).to exist
       expect(browser.button(src: /button\.png/)).to exist
       expect(browser.button(text: 'Button 2')).to exist
       expect(browser.button(text: /Button 2/)).to exist
@@ -41,16 +39,6 @@ describe 'Button' do
       expect(browser.button(value: /Button 4 With Child Text/)).to exist
     end
 
-    it 'returns true if the button exists (how = :caption)' do
-      expect {
-        expect(browser.button(caption: 'Button 2')).to exist
-      }.to have_deprecated_caption
-
-      expect {
-        expect(browser.button(caption: /Button 2/)).to exist
-      }.to have_deprecated_caption
-    end
-
     it 'returns the first button if given no args' do
       expect(browser.button).to exist
     end
@@ -137,10 +125,8 @@ describe 'Button' do
   end
 
   describe '#style' do
-    not_compliant_on :internet_explorer do
-      it 'returns the style attribute if the button exists' do
-        expect(browser.button(id: 'delete_user_submit').style).to eq 'border: 4px solid red;'
-      end
+    it 'returns the style attribute if the button exists' do
+      expect(browser.button(id: 'delete_user_submit').style).to include 'border: 4px solid red;'
     end
 
     it "returns an empty string if the element exists and the attribute doesn't exist" do
@@ -254,7 +240,7 @@ describe 'Button' do
     it 'clicks the button if it exists' do
       browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
       browser.button(id: 'delete_user_submit').click
-      Watir::Wait.until { !browser.url.include? 'forms_with_input_elements.html' }
+      browser.wait_while(url: /forms_with_input_elements\.html$/)
       expect(browser.text).to include('Semantic table')
     end
 

data/spec/watirspec/elements/checkbox_spec.rb

@@ -26,30 +26,16 @@ describe 'CheckBox' do
       expect(browser.checkbox(xpath: "//input[@id='new_user_interests_books']")).to exist
     end
 
-    not_compliant_on :watigiri do
-      it 'handles text_regexp deprecations for label locators' do
-        expect {
-          expect(browser.checkbox(label: /some visible/)).to exist
-        }.to_not have_deprecated_text_regexp
-
-        expect {
-          expect(browser.checkbox(label: /some (visible|Jeff)/)).to exist
-        }.to_not have_deprecated_text_regexp
-
-        expect {
-          expect(browser.checkbox(label: /this will not match/)).to exist
-        }.to_not have_deprecated_text_regexp
-      end
-
-      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
-        end
-      end
+    # TODO: More of this for text & labels somewhere central
+    it 'handles text_regexp deprecations for label locators' do
+      expect(browser.checkbox(label: /some visible/)).to exist
+      expect(browser.checkbox(label: /some (visible|Jeff)/)).to exist
+      expect(browser.checkbox(label: /none visible/)).to exist
+      expect(browser.checkbox(label: /this will not match/)).to_not exist
+    end
+
+    it 'handles text_regexp deprecation in spite of hidden text' do
+      expect(browser.checkbox(label: /some visible some hidden/)).to exist
     end
 
     it 'returns true if the checkbox button exists (search by name and value)' do

data/spec/watirspec/elements/date_field_spec.rb

@@ -19,20 +19,18 @@ describe 'DateField' do
       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
+    it 'returns true when using xpath',
+       except: {browser: %i[ie safari], reason: 'Date type not recognized'} do
+      expect(browser.date_field(xpath: "//input[@id='html5_date']")).to exist
     end
 
     it 'returns the date field if given no args' do
       expect(browser.date_field).to exist
     end
 
-    bug 'Safari does not recognize date type', :safari do
-      it 'respects date fields types' do
-        expect(browser.date_field.type).to eq('date')
-      end
+    it 'respects date fields types',
+       except: {browser: %i[ie safari], reason: 'Date type not recognized'} do
+      expect(browser.date_field.type).to eq('date')
     end
 
     it 'returns false if the element does not exist' do
@@ -78,15 +76,14 @@ describe 'DateField' do
     end
   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
+  describe '#type' do
+    it 'returns the type attribute if the date field exists',
+       except: {browser: %i[ie safari], reason: 'Date type not recognized'} 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
-      end
+    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
 

data/spec/watirspec/elements/date_time_field_spec.rb

@@ -15,23 +15,24 @@ describe 'DateTimeField' do
       expect(browser.date_time_field(text: '')).to exist
       expect(browser.date_time_field(text: //)).to exist
       expect(browser.date_time_field(index: 0)).to exist
-
-      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
-
       expect(browser.date_time_field(label: 'HTML5 Datetime Local')).to exist
       expect(browser.date_time_field(label: /Local$/)).to exist
     end
 
+    it 'returns true if the datetime-local element exists',
+       except: [{browser: :firefox, reason: 'https://github.com/mozilla/geckodriver/issues/1469'},
+                {browser: %i[ie safari], reason: 'Date type not recognized'}] do
+      expect(browser.date_time_field(xpath: "//input[@id='html5_datetime-local']")).to exist
+    end
+
     it 'returns the date-time field if given no args' do
       expect(browser.date_time_field).to exist
     end
 
-    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
+    it 'respects date-time fields types',
+       except: [{browser: :firefox, reason: 'https://github.com/mozilla/geckodriver/issues/1469'},
+                {browser: %i[ie safari], reason: 'Date type not recognized'}] do
+      expect(browser.date_time_field.type).to eq('datetime-local')
     end
 
     it 'returns false if the element does not exist' do
@@ -78,10 +79,10 @@ describe 'DateTimeField' do
   end
 
   describe '#type' 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
+    it 'returns the type attribute if the date-time field exists',
+       except: [{browser: :firefox, reason: 'https://github.com/mozilla/geckodriver/issues/1469'},
+                {browser: %i[ie safari], reason: 'Date type not recognized'}] do
+      expect(browser.date_time_field(id: 'html5_datetime-local').type).to eq 'datetime-local'
     end
 
     it "raises UnknownObjectException if the date-time field doesn't exist" do

data/spec/watirspec/elements/dd_spec.rb

@@ -55,10 +55,9 @@ describe 'Dd' do
       expect(browser.dd(id: 'someone').text).to eq 'John Doe'
     end
 
-    bug 'Safari does not strip text', :safari do
-      it 'returns an empty string if the element exists but contains no text' do
-        expect(browser.dd(class: 'noop').text).to eq ''
-      end
+    it 'returns an empty string if the element exists but contains no text',
+       except: {browser: :safari, reason: 'Safari does not strip text'} do
+      expect(browser.dd(class: 'noop').text).to eq ''
     end
 
     it 'raises UnknownObjectException if the element does not exist' do

data/spec/watirspec/elements/del_spec.rb

@@ -94,18 +94,16 @@ describe 'Del' do
   end
 
   # Other
-  not_compliant_on :headless do
-    describe '#click' do
-      it 'fires events' do
-        expect(browser.del(class: 'footer').text).to_not include('Javascript')
-        browser.del(class: 'footer').click
-        expect(browser.del(class: 'footer').text).to include('Javascript')
-      end
-
-      it "raises UnknownObjectException if the del doesn't exist" do
-        expect { browser.del(id: 'no_such_id').click }.to raise_unknown_object_exception
-        expect { browser.del(title: 'no_such_title').click }.to raise_unknown_object_exception
-      end
+  describe '#click', except: {headless: true} do
+    it 'fires events' do
+      expect(browser.del(class: 'footer').text).to_not include('Javascript')
+      browser.del(class: 'footer').click
+      expect(browser.del(class: 'footer').text).to include('Javascript')
+    end
+
+    it "raises UnknownObjectException if the del doesn't exist" do
+      expect { browser.del(id: 'no_such_id').click }.to raise_unknown_object_exception
+      expect { browser.del(title: 'no_such_title').click }.to raise_unknown_object_exception
     end
   end
 end

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
@@ -71,10 +75,8 @@ describe 'Div' do
   end
 
   describe '#style' do
-    not_compliant_on :internet_explorer do
-      it 'returns the style attribute if the element exists' do
-        expect(browser.div(id: 'best_language').style).to eq 'color: red; text-decoration: underline; cursor: pointer;'
-      end
+    it 'returns the style attribute if the element exists' do
+      expect(browser.div(id: 'best_language').style).to eq 'color: red; text-decoration: underline; cursor: pointer;'
     end
 
     it "returns an empty string if the element exists but the attribute doesn't" do
@@ -97,10 +99,9 @@ describe 'Div' do
       expect(browser.div(index: 0).text.strip).to eq ''
     end
 
-    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
+    it 'returns an empty string if the div is hidden',
+       except: {browser: :safari, reason: 'Safari is not filtering out hidden text'} do
+      expect(browser.div(id: 'hidden').text).to eq ''
     end
 
     it 'raises UnknownObjectException if the element does not exist' do
@@ -126,40 +127,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
@@ -199,57 +166,51 @@ describe 'Div' do
     end
   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
+  describe '#double_click',
+           except: {browser: :safari, reason: 'command correctly received, but action not taken'} 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
+
+  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', except: {browser: :ie} 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
 
-      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
+    it 'scrolls' do
+      browser.del(class: 'footer').double_click
+      puts 'yes?'
     end
   end
 
   describe '#html' do
-    not_compliant_on :internet_explorer do
-      it 'returns the HTML of the element' do
-        html = browser.div(id: 'footer').html.downcase
-        expect(html).to include('id="footer"')
-        expect(html).to include('title="closing remarks"')
-        expect(html).to include('class="profile"')
-
-        expect(html).to_not include('<div id="content">')
-        expect(html).to_not include('</body>')
-      end
-    end
-
-    deviates_on :internet_explorer do
-      it 'returns the HTML of the element' do
-        html = browser.div(id: 'footer').html.downcase
-        expect(html).to include('title="closing remarks"')
-        expect(html).to_not include('</body>')
-      end
+    it 'returns the HTML of the element' do
+      html = browser.div(id: 'footer').html.downcase
+      expect(html).to include('id="footer"')
+      expect(html).to include('title="closing remarks"')
+      expect(html).to include('class="profile"')
+
+      expect(html).to_not include('<div id="content">')
+      expect(html).to_not include('</body>')
     end
   end
 end