watir 6.5.0 → 6.6.0

data/spec/watirspec/after_hooks_spec.rb

@@ -71,40 +71,38 @@ describe "Browser::AfterHooks" do
     end
 
     bug "AutomatedTester: 'known bug with execute script'", :firefox do
-      it "runs after_hooks after Element#submit" do
-        browser.goto(WatirSpec.url_for("forms_with_input_elements.html"))
-        @page_after_hook = Proc.new { @yield = browser.div(id: 'messages').text == 'submit' }
-        browser.after_hooks.add @page_after_hook
-        browser.form(id: "new_user").submit
-        expect(@yield).to be true
-      end
-    end
-
-    not_compliant_on :safari do
-      bug "Actions Endpoint Not Yet Implemented", :firefox do
-        it "runs after_hooks after Element#double_click" do
-          browser.goto(WatirSpec.url_for("non_control_elements.html"))
-          @page_after_hook = Proc.new { @yield = browser.title == "Non-control elements" }
+      not_compliant_on :safari do
+        it "runs after_hooks after Element#submit" do
+          browser.goto(WatirSpec.url_for("forms_with_input_elements.html"))
+          @page_after_hook = Proc.new { @yield = browser.div(id: 'messages').text == 'submit' }
           browser.after_hooks.add @page_after_hook
-          browser.div(id: 'html_test').double_click
+          browser.form(id: "new_user").submit
           expect(@yield).to be true
         end
       end
     end
 
-    not_compliant_on :safari do
-      bug "Actions Endpoint Not Yet Implemented", :firefox do
-        it "runs after_hooks after Element#right_click" do
-          browser.goto(WatirSpec.url_for("right_click.html"))
-          @page_after_hook = Proc.new { @yield = browser.title == "Right Click Test" }
-          browser.after_hooks.add @page_after_hook
-          browser.div(id: "click").right_click
-          expect(@yield).to be true
-        end
+    bug "Actions Endpoint Not Yet Implemented", :firefox do
+      it "runs after_hooks after Element#double_click" do
+        browser.goto(WatirSpec.url_for("non_control_elements.html"))
+        @page_after_hook = Proc.new { @yield = browser.title == "Non-control elements" }
+        browser.after_hooks.add @page_after_hook
+        browser.div(id: 'html_test').double_click
+        expect(@yield).to be true
+      end
+    end
+
+    bug "Actions Endpoint Not Yet Implemented", :firefox do
+      it "runs after_hooks after Element#right_click" do
+        browser.goto(WatirSpec.url_for("right_click.html"))
+        @page_after_hook = Proc.new { @yield = browser.title == "Right Click Test" }
+        browser.after_hooks.add @page_after_hook
+        browser.div(id: "click").right_click
+        expect(@yield).to be true
       end
     end
 
-    not_compliant_on :safari do
+    not_compliant_on :headless do
       it "runs after_hooks after Alert#ok" do
         browser.goto(WatirSpec.url_for("alerts.html"))
         @page_after_hook = Proc.new { @yield = browser.title == "Alerts" }
@@ -113,7 +111,9 @@ describe "Browser::AfterHooks" do
         browser.alert.ok
         expect(@yield).to be true
       end
+    end
 
+    not_compliant_on :headless do
       bug "https://code.google.com/p/chromedriver/issues/detail?id=26", [:chrome, :macosx] do
         it "runs after_hooks after Alert#close" do
           browser.goto(WatirSpec.url_for("alerts.html"))
@@ -124,21 +124,22 @@ describe "Browser::AfterHooks" do
           expect(@yield).to be true
         end
       end
+    end
 
-      bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1279211", :firefox do
+    bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1279211", :firefox do
+      not_compliant_on :safari, :headless do
         it "raises UnhandledAlertError error when running error checks with alert present" do
           url = WatirSpec.url_for("alerts.html")
           @page_after_hook = Proc.new { browser.url }
           browser.after_hooks.add @page_after_hook
           browser.goto url
           expect { browser.button(id: "alert").click }.to raise_error(Selenium::WebDriver::Error::UnhandledAlertError)
-
-          not_compliant_on :ff_legacy do
-            browser.alert.ok
-          end
+          browser.alert.ok
         end
       end
+    end
 
+    not_compliant_on :headless do
       it "does not raise error when running error checks using #after_hooks#without with alert present" do
         url = WatirSpec.url_for("alerts.html")
         @page_after_hook = Proc.new { browser.url }
@@ -147,7 +148,9 @@ describe "Browser::AfterHooks" do
         expect { browser.after_hooks.without { browser.button(id: "alert").click } }.to_not raise_error
         browser.alert.ok
       end
+    end
 
+    not_compliant_on :headless do
       it "does not raise error if no error checks are defined with alert present" do
         url = WatirSpec.url_for("alerts.html")
         @page_after_hook = Proc.new { browser.url }
@@ -160,17 +163,19 @@ describe "Browser::AfterHooks" do
     end
 
     bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1223277", :firefox do
-      it "does not raise error when running error checks on closed window" do
-        url = WatirSpec.url_for("window_switching.html")
-        @page_after_hook = Proc.new { browser.url }
-        browser.after_hooks.add @page_after_hook
-        browser.goto url
-        browser.a(id: "open").click
+      not_compliant_on :headless do
+        it "does not raise error when running error checks on closed window" do
+          url = WatirSpec.url_for("window_switching.html")
+          @page_after_hook = Proc.new { browser.url }
+          browser.after_hooks.add @page_after_hook
+          browser.goto url
+          browser.a(id: "open").click
 
-        window = browser.window(title: "closeable window")
-        window.use
-        expect { browser.a(id: "close").click }.to_not raise_error
-        browser.window(index: 0).use
+          window = browser.window(title: "closeable window")
+          window.use
+          expect { browser.a(id: "close").click }.to_not raise_error
+          browser.window(index: 0).use
+        end
       end
     end
   end

data/spec/watirspec/alert_spec.rb

@@ -1,7 +1,7 @@
 require "watirspec_helper"
 
-describe 'Alert API' do
-  not_compliant_on :safari do
+not_compliant_on :headless do
+  describe 'Alert API' do
     before do
       browser.goto WatirSpec.url_for("alerts.html")
     end
@@ -23,26 +23,32 @@ describe 'Alert API' do
           expect(browser.alert).to_not exist
         end
 
-        it 'returns true if alert is present' do
-          browser.button(id: 'alert').click
-          browser.wait_until(timeout: 10) { browser.alert.exists? }
+        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
       end
 
       describe '#ok' do
-        it 'closes alert' do
-          browser.button(id: 'alert').click
-          browser.alert.ok
-          expect(browser.alert).to_not exist
+        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
       end
 
       bug "https://code.google.com/p/chromedriver/issues/detail?id=26", [:chrome, :macosx] do
-        describe '#close' do
-          it 'closes alert' do
-            browser.button(id: 'alert').click
-            browser.alert.close
-            expect(browser.alert).to_not exist
+        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
       end

data/spec/watirspec/browser_spec.rb

@@ -14,22 +14,24 @@ describe "Browser" do
     end
 
     bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1223277", :firefox 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
+      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
       end
     end
 
     bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1290814", :firefox do
       it "returns false after Browser#close" do
-        b = WatirSpec.new_browser
-        b.close
-        expect(b).to_not exist
+        browser.close
+        expect(browser).to_not exist
+        $browser = WatirSpec.new_browser
       end
     end
   end
@@ -95,10 +97,12 @@ describe "Browser" do
       expect(browser.text.strip).to eq 'This is text/plain'
     end
 
-    it "returns text of top most browsing context" do
-      browser.goto(WatirSpec.url_for("nested_iframes.html"))
-      browser.iframe(id: 'two').h3.exists?
-      expect(browser.text).to eq 'Top Layer'
+    bug "Safari does not strip text", :safari do
+      it "returns text of top most browsing context" do
+        browser.goto(WatirSpec.url_for("nested_iframes.html"))
+        browser.iframe(id: 'two').h3.exists?
+        expect(browser.text).to eq 'Top Layer'
+      end
     end
   end
 
@@ -132,12 +136,14 @@ describe "Browser" do
   describe ".start" do
     bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1290814", :firefox do
       it "goes to the given URL and return an instance of itself" do
+        browser.close
         driver, args = WatirSpec.implementation.browser_args
-        browser = Watir::Browser.start(WatirSpec.url_for("non_control_elements.html"), driver, args)
+        b = Watir::Browser.start(WatirSpec.url_for("non_control_elements.html"), driver, args.dup)
 
-        expect(browser).to be_instance_of(Watir::Browser)
-        expect(browser.title).to eq "Non-control elements"
-        browser.close
+        expect(b).to be_instance_of(Watir::Browser)
+        expect(b.title).to eq "Non-control elements"
+        b.close
+        $browser = WatirSpec.new_browser
       end
     end
   end
@@ -160,24 +166,12 @@ describe "Browser" do
       expect { browser.goto("about:blank") }.to_not raise_error
     end
 
-    not_compliant_on :internet_explorer, :safari do
+    not_compliant_on :internet_explorer do
       it "goes to a data URL scheme address without raising errors" do
         expect { browser.goto("data:text/html;content-type=utf-8,foobar") }.to_not raise_error
       end
     end
 
-    compliant_on :ff_legacy do
-      it "goes to internal Firefox URL 'about:mozilla' without raising errors" do
-        expect { browser.goto("about:mozilla") }.to_not raise_error
-      end
-    end
-
-    compliant_on :opera do
-      it "goes to internal Opera URL 'opera:config' without raising errors" do
-        expect { browser.goto("opera:config") }.to_not raise_error
-      end
-    end
-
     compliant_on :chrome do
       it "goes to internal Chrome URL 'chrome://settings/browser' without raising errors" do
         expect { browser.goto("chrome://settings/browser") }.to_not raise_error
@@ -191,14 +185,16 @@ describe "Browser" do
     end
   end
 
-  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')
+  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')
+      end
     end
   end
 
@@ -240,46 +236,44 @@ describe "Browser" do
     end
   end
 
-  not_compliant_on :safari do
-    describe "#back and #forward" do
-      it "goes to the previous page" do
-        browser.goto WatirSpec.url_for("non_control_elements.html")
-        orig_url = browser.url
-        browser.goto WatirSpec.url_for("tables.html")
-        new_url = browser.url
-        expect(orig_url).to_not eq new_url
-        browser.back
-        expect(orig_url).to eq browser.url
-      end
-
-      it "goes to the next page" do
-        urls = []
-        browser.goto WatirSpec.url_for("non_control_elements.html")
-        urls << browser.url
-        browser.goto WatirSpec.url_for("tables.html")
-        urls << browser.url
-
-        browser.back
-        expect(browser.url).to eq urls.first
-        browser.forward
-        expect(browser.url).to eq urls.last
-      end
+  describe "#back and #forward" do
+    it "goes to the previous page" do
+      browser.goto WatirSpec.url_for("non_control_elements.html")
+      orig_url = browser.url
+      browser.goto WatirSpec.url_for("tables.html")
+      new_url = browser.url
+      expect(orig_url).to_not eq new_url
+      browser.back
+      expect(orig_url).to eq browser.url
+    end
 
-      it "navigates between several history items" do
-        urls = ["non_control_elements.html",
-                "tables.html",
-                "forms_with_input_elements.html",
-                "definition_lists.html"
-        ].map do |page|
-          browser.goto WatirSpec.url_for(page)
-          browser.url
-        end
+    it "goes to the next page" do
+      urls = []
+      browser.goto WatirSpec.url_for("non_control_elements.html")
+      urls << browser.url
+      browser.goto WatirSpec.url_for("tables.html")
+      urls << browser.url
+
+      browser.back
+      expect(browser.url).to eq urls.first
+      browser.forward
+      expect(browser.url).to eq urls.last
+    end
 
-        3.times { browser.back }
-        expect(browser.url).to eq urls.first
-        2.times { browser.forward }
-        expect(browser.url).to eq urls[2]
+    it "navigates between several history items" do
+      urls = ["non_control_elements.html",
+              "tables.html",
+              "forms_with_input_elements.html",
+              "definition_lists.html"
+      ].map do |page|
+        browser.goto WatirSpec.url_for(page)
+        browser.url
       end
+
+      3.times { browser.back }
+      expect(browser.url).to eq urls.first
+      2.times { browser.forward }
+      expect(browser.url).to eq urls[2]
     end
   end
 

data/spec/watirspec/cookies_spec.rb

@@ -48,11 +48,6 @@ describe "Browser#cookies" do
 
       browser.cookies.add 'foo', 'bar'
       verify_cookies_count 2
-
-      compliant_on :safari do
-        $browser.close
-        $browser = WatirSpec.new_browser
-      end
     end
   end
 
@@ -118,17 +113,19 @@ describe "Browser#cookies" do
     end
 
     describe '#load' do
-      it 'loads cookies from file' do
-        browser.cookies.clear
-        browser.cookies.load file
-        expected = browser.cookies.to_a
-        actual = YAML.load(IO.read(file))
-
-        # https://code.google.com/p/selenium/issues/detail?id=6834
-        expected.each { |cookie| cookie.delete(:expires) }
-        actual.each { |cookie| cookie.delete(:expires) }
-
-        expect(actual).to eq(expected)
+      bug "invalid expiration issue", :firefox do
+        it 'loads cookies from file' do
+          browser.cookies.clear
+          browser.cookies.load file
+          expected = browser.cookies.to_a
+          actual = YAML.load(IO.read(file))
+
+          # https://code.google.com/p/selenium/issues/detail?id=6834
+          expected.each { |cookie| cookie.delete(:expires) }
+          actual.each { |cookie| cookie.delete(:expires) }
+
+          expect(actual).to eq(expected)
+        end
       end
     end
   end

data/spec/watirspec/drag_and_drop_spec.rb

@@ -2,20 +2,20 @@ require "watirspec_helper"
 
 describe "Element" do
   bug "Actions Endpoint Not Yet Implemented", :firefox do
-    context "drag and drop" do
-      before { browser.goto WatirSpec.url_for("drag_and_drop.html") }
+    bug "Safari does not strip text", :safari do
+      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" }
 
-      not_compliant_on :safari do
         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
 
-        bug "http://code.google.com/p/selenium/issues/detail?id=3075", :ff_legacy do
+        not_compliant_on :headless 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