watir 6.16.5 → 6.17.0

data/spec/watirspec/alert_spec.rb

@@ -1,110 +1,100 @@
 require 'watirspec_helper'
 
-not_compliant_on :headless do
-  describe 'Alert API' do
-    before do
-      browser.goto WatirSpec.url_for('alerts.html')
-    end
+describe 'Alert API' do
+  before do
+    browser.goto WatirSpec.url_for('alerts.html')
+  end
 
-    after do
-      browser.alert.ok if browser.alert.exists?
-    end
+  after do
+    browser.alert.ok if browser.alert.exists?
+  end
 
-    compliant_on :relaxed_locate do
-      context 'Relaxed Waits' do
-        context 'when acting on an alert' do
-          it 'raises exception after timing out' do
-            expect { browser.alert.text }.to wait_and_raise_unknown_object_exception
-          end
+  compliant_on :relaxed_locate do
+    context 'Relaxed Waits' do
+      context 'when acting on an alert' do
+        it 'raises exception after timing out' do
+          expect { browser.alert.text }.to wait_and_raise_unknown_object_exception
         end
       end
     end
+  end
 
-    context 'alert' do
-      describe '#text' do
-        it 'returns text of alert' do
-          browser.button(id: 'alert').click
-          expect(browser.alert.text).to include('ok')
-        end
+  context 'alert' do
+    describe '#text' do
+      it 'returns text of alert' do
+        browser.button(id: 'alert').click
+        expect(browser.alert.text).to include('ok')
       end
+    end
 
-      describe '#exists?' do
-        it 'returns false if alert is not present' do
-          expect(browser.alert).to_not exist
-        end
+    describe '#exists?' do
+      it 'returns false if alert is not present' do
+        expect(browser.alert).to_not exist
+      end
 
-        bug 'Alert exception not thrown, so Browser#inspect hangs', :safari do
-          it 'returns true if alert is present' do
-            browser.button(id: 'alert').click
-            browser.wait_until(timeout: 10) { browser.alert.exists? }
-          end
-        end
+      it 'returns true if alert is present' do
+        browser.button(id: 'alert').click
+        browser.wait_until(timeout: 10) { browser.alert.exists? }
       end
+    end
 
-      describe '#ok' do
-        not_compliant_on :safari do
-          it 'closes alert' do
-            browser.button(id: 'alert').click
-            browser.alert.ok
-            expect(browser.alert).to_not exist
-          end
-        end
+    describe '#ok' do
+      it 'closes alert' do
+        browser.button(id: 'alert').click
+        browser.alert.ok
+        expect(browser.alert).to_not exist
       end
+    end
 
-      bug 'https://code.google.com/p/chromedriver/issues/detail?id=26', [:chrome, :macosx] do
-        not_compliant_on :safari do
-          describe '#close' do
-            it 'closes alert' do
-              browser.button(id: 'alert').click
-              browser.alert.close
-              expect(browser.alert).to_not exist
-            end
-          end
-        end
+    describe '#close' do
+      it 'closes alert' do
+        browser.button(id: 'alert').click
+        browser.alert.close
+        expect(browser.alert).to_not exist
       end
+    end
 
-      not_compliant_on :relaxed_locate do
-        describe 'wait_until_present' do
-          it 'waits until alert is present and goes on' do
-            browser.button(id: 'timeout-alert').click
-            browser.alert.wait_until_present.ok
+    not_compliant_on :relaxed_locate do
+      describe 'wait_until_present' do
+        it 'waits until alert is present and goes on' do
+          browser.button(id: 'timeout-alert').click
+          browser.alert.wait_until_present.ok
 
-            expect(browser.alert).to_not exist
-          end
+          expect(browser.alert).to_not exist
+        end
 
-          it 'raises error if alert is not present after timeout' do
-            expect { browser.alert.wait_until_present.ok }.to raise_timeout_exception
-          end
+        it 'raises error if alert is not present after timeout' do
+          expect { browser.alert.wait_until_present.ok }.to raise_timeout_exception
         end
       end
     end
+  end
 
-    context 'confirm' do
-      describe '#ok' do
-        it 'accepts confirm' do
-          browser.button(id: 'confirm').click
-          browser.alert.ok
-          expect(browser.button(id: 'confirm').value).to eq 'true'
-        end
+  context 'confirm' do
+    describe '#ok' do
+      it 'accepts confirm' do
+        browser.button(id: 'confirm').click
+        browser.alert.ok
+        expect(browser.button(id: 'confirm').value).to eq 'true'
       end
+    end
 
-      describe '#close' do
-        it 'cancels confirm' do
-          browser.button(id: 'confirm').click
-          browser.alert.close
-          expect(browser.button(id: 'confirm').value).to eq 'false'
-        end
+    describe '#close' do
+      it 'cancels confirm' do
+        browser.button(id: 'confirm').click
+        browser.alert.close
+        expect(browser.button(id: 'confirm').value).to eq 'false'
       end
     end
+  end
 
-    context 'prompt' do
-      describe '#set' do
-        it 'enters text to prompt' do
-          browser.button(id: 'prompt').click
-          browser.alert.set 'My Name'
-          browser.alert.ok
-          expect(browser.button(id: 'prompt').value).to eq 'My Name'
-        end
+  context 'prompt' do
+    describe '#set' do
+      it 'enters text to prompt' do
+        browser.button(id: 'prompt').click
+        browser.alert.set 'My Name'
+        browser.alert.ok
+        expect(browser.button(id: 'prompt').value).to eq 'My Name'
       end
     end
   end

data/spec/watirspec/browser_spec.rb

@@ -12,17 +12,15 @@ describe 'Browser' do
       expect(browser).to exist
     end
 
-    bug 'https://bugzilla.mozilla.org/show_bug.cgi?id=1223277', :firefox do
-      not_compliant_on :headless do
-        it 'returns false if window is closed' do
-          browser.goto WatirSpec.url_for('window_switching.html')
-          browser.a(id: 'open').click
-          Watir::Wait.until { browser.windows.size == 2 }
-          browser.window(title: 'closeable window').use
-          browser.a(id: 'close').click
-          Watir::Wait.until { browser.windows.size == 1 }
-          expect(browser.exists?).to be false
-        end
+    bug 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException', :safari do
+      it 'returns false if window is closed' do
+        browser.goto WatirSpec.url_for('window_switching.html')
+        browser.a(id: 'open').click
+        Watir::Wait.until { browser.windows.size == 2 }
+        browser.window(title: 'closeable window').use
+        browser.a(id: 'close').click
+        Watir::Wait.until { browser.windows.size == 1 }
+        expect(browser.exists?).to be false
       end
     end
 
@@ -74,7 +72,7 @@ describe 'Browser' do
     end
   end
 
-  bug 'Capitalization bug fixed in upcoming release', %i[remote firefox] do
+  bug 'Capitalization issue', :safari do
     describe '#name' do
       it 'returns browser name' do
         expect(browser.name).to eq(WatirSpec.implementation.browser_args.first)
@@ -159,8 +157,8 @@ describe 'Browser' do
           @original = WatirSpec.implementation.clone
 
           require 'watirspec/remote_server'
-          args = ["-Dwebdriver.chrome.driver=#{Webdrivers::Chromedriver.binary}",
-                  "-Dwebdriver.gecko.driver=#{Webdrivers::Geckodriver.binary}"]
+          args = ["-Dwebdriver.chrome.driver=#{Webdrivers::Chromedriver.driver_path}",
+                  "-Dwebdriver.gecko.driver=#{Webdrivers::Geckodriver.driver_path}"]
           WatirSpec::RemoteServer.new.start(4544, args: args)
           browser.close
         end
@@ -287,13 +285,15 @@ describe 'Browser' do
 
       compliant_on :chrome do
         not_compliant_on :watigiri do
-          it 'takes port and driver_opt as arguments' do
+          it 'takes service as argument' do
             @original = WatirSpec.implementation.clone
             browser.close
             @opts = WatirSpec.implementation.browser_args.last
+            browser_name = WatirSpec.implementation.browser_args.first
+
+            service = Selenium::WebDriver::Service.send(browser_name, port: '2314', args: ['foo'])
 
-            @opts.merge!(port: '2314',
-                         driver_opts: {args: ['foo']},
+            @opts.merge!(service: service,
                          listener: LocalConfig::SelectorListener.new)
 
             @new_browser = WatirSpec.new_browser
@@ -373,16 +373,19 @@ describe 'Browser' do
     end
   end
 
-  not_compliant_on :headless do
-    describe '#refresh' do
-      it 'refreshes the page' do
-        browser.goto(WatirSpec.url_for('non_control_elements.html'))
-        browser.span(class: 'footer').click
-        expect(browser.span(class: 'footer').text).to include('Javascript')
-        browser.refresh
-        browser.span(class: 'footer').wait_until(&:present?)
-        expect(browser.span(class: 'footer').text).to_not include('Javascript')
+  describe '#refresh' do
+    it 'refreshes the page' do
+      browser.goto(WatirSpec.url_for('non_control_elements.html'))
+
+      compliant_on :headless do
+        browser.div(id: 'best_language').scroll.to
       end
+
+      browser.div(id: 'best_language').click
+      expect(browser.div(id: 'best_language').text).to include('Ruby!')
+      browser.refresh
+      browser.div(id: 'best_language').wait_until(&:present?)
+      expect(browser.div(id: 'best_language').text).to_not include('Ruby!')
     end
   end
 
@@ -509,27 +512,26 @@ describe 'Browser' do
 
   describe '#wait' do
     # The only way to get engage this method is with page load strategy set to "none"
-    # Chrome will be blocking on document ready state because it does not yet support page load strategy
     # This spec is both mocking out the response and demonstrating the necessary settings for it to be meaningful
-    not_compliant_on :chrome do
-      it 'waits for document ready state to be complete' do
-        @original = WatirSpec.implementation.clone
-        browser.close
-        @opts = WatirSpec.implementation.browser_args.last
-
-        @opts[:page_load_strategy] = 'none'
-        browser = WatirSpec.new_browser
-
-        start_time = Time.now
-        allow(browser).to receive(:ready_state) { Time.now < start_time + 3 ? 'loading' : 'complete' }
-        expect(browser.ready_state).to eq 'loading'
-        browser.wait(20)
-        expect(browser.ready_state).to eq 'complete'
-
-        browser.close
-        WatirSpec.implementation = @original.clone
-        $browser = WatirSpec.new_browser
-      end
+    it 'waits for document ready state to be complete' do
+      @original = WatirSpec.implementation.clone
+      browser.close
+      @opts = WatirSpec.implementation.browser_args.last
+
+      @opts[:page_load_strategy] = 'none'
+      browser = WatirSpec.new_browser
+
+      start_time = Time.now
+      allow(browser).to receive(:ready_state) { Time.now < start_time + 3 ? 'loading' : 'complete' }
+      expect(browser.ready_state).to eq 'loading'
+
+      browser.wait(20)
+      expect(Time.now - start_time).to be > 3
+      expect(browser.ready_state).to eq 'complete'
+
+      browser.close
+      WatirSpec.implementation = @original.clone
+      $browser = WatirSpec.new_browser
     end
   end
 

data/spec/watirspec/cookies_spec.rb

@@ -42,7 +42,7 @@ describe 'Browser#cookies' do
   end
 
   not_compliant_on :internet_explorer do
-    it 'adds a cookie' do
+    it 'adds a cookie without options' do
       browser.goto set_cookie_url
       verify_cookies_count 1
 
@@ -63,29 +63,49 @@ describe 'Browser#cookies' do
     end
   end
 
-  # TODO: - Split this up into multiple tests or figure out which parts are not compliant
-  not_compliant_on :chrome, :internet_explorer, :safari, :firefox do
-    it 'adds a cookie with options' do
+  it 'adds a cookie with path' do
+    browser.goto set_cookie_url
+
+    options = {path: '/set_cookie'}
+
+    browser.cookies.add 'path', 'b', options
+    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
+
+    expires = Time.now + 10_000
+    options = {expires: expires}
+
+    browser.cookies.add 'expiration', 'b', options
+    cookie = browser.cookies.to_a.find { |e| e[:name] == 'expiration' }
+
+    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
 
-      expires = Time.now + 10_000
-      options = {path: '/set_cookie',
-                 secure: true,
-                 expires: expires}
+      options = {secure: true}
 
-      browser.cookies.add 'a', 'b', options
-      cookie = browser.cookies.to_a.find { |e| e[:name] == 'a' }
+      browser.cookies.add 'secure', 'b', options
+      cookie = browser.cookies.to_a.find { |e| e[:name] == 'secure' }
       expect(cookie).to_not be_nil
 
-      expect(cookie[:name]).to eq 'a'
+      expect(cookie[:name]).to eq 'secure'
       expect(cookie[:value]).to eq 'b'
-
-      expect(cookie[:path]).to eq '/set_cookie'
       expect(cookie[:secure]).to be true
-
-      expect(cookie[:expires]).to be_kind_of(Time)
-      # a few ms slack
-      expect((cookie[:expires]).to_i).to be_within(2).of(expires.to_i)
     end
   end
 
@@ -98,15 +118,13 @@ describe 'Browser#cookies' do
       verify_cookies_count 0
     end
 
-    bug 'https://code.google.com/p/selenium/issues/detail?id=5487', :safari do
-      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
   end
 
@@ -124,20 +142,17 @@ describe 'Browser#cookies' do
       end
     end
 
-    bug 'https://github.com/mozilla/geckodriver/issues/1000', :firefox do
-      describe '#load' do
-        it 'loads cookies from file' do
-          browser.cookies.clear
-          browser.cookies.load file
-          expected = browser.cookies.to_a
-          actual = YAML.safe_load(IO.read(file), [::Symbol])
+    describe '#load' do
+      it 'loads cookies from file' do
+        browser.cookies.clear
+        browser.cookies.load file
+        expected = browser.cookies.to_a
+        actual = YAML.safe_load(IO.read(file), [::Symbol])
 
-          # https://code.google.com/p/selenium/issues/detail?id=6834
-          expected.each { |cookie| cookie.delete(:expires) }
-          actual.each { |cookie| cookie.delete(:expires) }
+        expected.each { |cookie| cookie.delete(:expires) }
+        actual.each { |cookie| cookie.delete(:expires) }
 
-          expect(actual).to eq(expected)
-        end
+        expect(actual).to eq(expected)
       end
     end
   end

data/spec/watirspec/drag_and_drop_spec.rb

@@ -1,47 +1,23 @@
 require 'watirspec_helper'
 
 describe 'Element' do
-  not_compliant_on %i[remote firefox] do
-    bug 'Safari does not strip text', :safari do
-      context 'drag and drop' do
-        before { browser.goto WatirSpec.url_for('drag_and_drop.html') }
+  context 'drag and drop' do
+    before { browser.goto WatirSpec.url_for('drag_and_drop.html') }
 
-        let(:draggable) { browser.div id: 'draggable' }
-        let(:droppable) { browser.div id: 'droppable' }
+    let(:draggable) { browser.div id: 'draggable' }
+    let(:droppable) { browser.div id: 'droppable' }
 
-        it 'can drag and drop an element onto another' do
-          expect(droppable.text).to eq 'Drop here'
-          draggable.drag_and_drop_on droppable
-          expect(droppable.text).to eq 'Dropped!'
-        end
-
-        not_compliant_on :headless, :firefox do
-          it 'can drag and drop an element onto another when draggable is out of viewport' do
-            reposition 'draggable'
-            perform_drag_and_drop_on_droppable
-          end
-
-          it 'can drag and drop an element onto another when droppable is out of viewport' do
-            reposition 'droppable'
-            perform_drag_and_drop_on_droppable
-          end
-        end
-
-        it 'can drag an element by the given offset' do
-          expect(droppable.text).to eq 'Drop here'
-          draggable.drag_and_drop_by 200, 50
-          expect(droppable.text).to eq 'Dropped!'
-        end
-
-        def reposition(what)
-          browser.button(id: "reposition#{what.capitalize}").click
-        end
+    it 'can drag and drop an element onto another' do
+      expect(droppable.text).to include 'Drop here'
+      draggable.drag_and_drop_on droppable
+      expect(droppable.text).to include 'Dropped!'
+    end
 
-        def perform_drag_and_drop_on_droppable
-          expect(droppable.text).to eq 'Drop here'
-          draggable.drag_and_drop_on droppable
-          expect(droppable.text).to eq '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
     end
   end