watir 6.10.0 → 6.10.1

data/spec/watirspec/after_hooks_spec.rb

@@ -1,182 +1,182 @@
-require "watirspec_helper"
-
-describe "Browser::AfterHooks" do
-  describe "#add" do
-    it "raises ArgumentError when not given any arguments" do
-      expect { browser.after_hooks.add }.to raise_error(ArgumentError)
-    end
-
-    it "runs the given proc on each page load" do
-      output = ''
-      proc = Proc.new { |browser| output << browser.text }
-
-      begin
-        browser.after_hooks.add(proc)
-        browser.goto(WatirSpec.url_for("non_control_elements.html"))
-
-        expect(output).to include('Dubito, ergo cogito, ergo sum')
-      ensure
-        browser.after_hooks.delete(proc)
-      end
-    end
-  end
-
-  describe "#delete" do
-    it "removes a previously added after_hook" do
-      output = ''
-      after_hook = lambda{ |browser| output << browser.text }
-
-      browser.after_hooks.add(after_hook)
-      browser.goto(WatirSpec.url_for("non_control_elements.html"))
-      expect(output).to include('Dubito, ergo cogito, ergo sum')
-
-      browser.after_hooks.delete(after_hook)
-      browser.goto(WatirSpec.url_for("definition_lists.html"))
-      expect(output).to_not include('definition_lists')
-    end
-  end
-
-  describe "#run" do
-    after(:each) do
-      browser.original_window.use
-      browser.after_hooks.delete @page_after_hook
-    end
-
-    it "runs after_hooks after Browser#goto" do
-      @page_after_hook = Proc.new { @yield = browser.title == "The font element" }
-      browser.after_hooks.add @page_after_hook
-      browser.goto WatirSpec.url_for("font.html")
-      expect(@yield).to be true
-    end
-
-    it "runs after_hooks after Browser#refresh" do
-      browser.goto WatirSpec.url_for("font.html")
-      @page_after_hook = Proc.new do
-        @yield = browser.title == "The font element"
-      end
-      browser.after_hooks.add @page_after_hook
-      browser.refresh
-      expect(@yield).to be true
-    end
-
-    it "runs after_hooks after Element#click" do
-      browser.goto(WatirSpec.url_for("non_control_elements.html"))
-      @page_after_hook = Proc.new do
-        browser.wait_until { |b| b.title == "Forms with input elements" }
-        @yield = true
-      end
-      browser.after_hooks.add @page_after_hook
-      browser.link(index: 2).click
-      expect(@yield).to be true
-    end
-
-    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.form(id: "new_user").submit
-        expect(@yield).to be true
-      end
-    end
-
-    bug "MoveTargetOutOfBoundsError", :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
-
-    not_compliant_on %i(remote 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 :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" }
-        browser.after_hooks.add @page_after_hook
-        browser.after_hooks.without { browser.button(id: 'alert').click }
-        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"))
-          @page_after_hook = Proc.new { @yield = browser.title == "Alerts" }
-          browser.after_hooks.add @page_after_hook
-          browser.after_hooks.without { browser.button(id: 'alert').click }
-          browser.alert.close
-          expect(@yield).to be true
-        end
-      end
-    end
-
-    not_compliant_on :safari, :headless do
-      it "does not run error checks with alert present" do
-        browser.goto WatirSpec.url_for("alerts.html")
-
-        @page_after_hook = Proc.new { @yield = browser.title == "Alerts" }
-        browser.after_hooks.add @page_after_hook
-
-        browser.button(id: "alert").click
-        expect(@yield).to be_nil
-
-        browser.alert.ok
-        expect(@yield).to eq true
-      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 }
-        browser.after_hooks.add @page_after_hook
-        browser.goto url
-        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 }
-        browser.after_hooks.add @page_after_hook
-        browser.goto url
-        browser.after_hooks.delete @page_after_hook
-        expect { browser.button(id: "alert").click }.to_not raise_error
-        browser.alert.ok
-      end
-    end
-
-    bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1223277", :firefox do
-      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.original_window.use
-        end
-      end
-    end
-  end
-end
+require "watirspec_helper"
+
+describe "Browser::AfterHooks" do
+  describe "#add" do
+    it "raises ArgumentError when not given any arguments" do
+      expect { browser.after_hooks.add }.to raise_error(ArgumentError)
+    end
+
+    it "runs the given proc on each page load" do
+      output = ''
+      proc = Proc.new { |browser| output << browser.text }
+
+      begin
+        browser.after_hooks.add(proc)
+        browser.goto(WatirSpec.url_for("non_control_elements.html"))
+
+        expect(output).to include('Dubito, ergo cogito, ergo sum')
+      ensure
+        browser.after_hooks.delete(proc)
+      end
+    end
+  end
+
+  describe "#delete" do
+    it "removes a previously added after_hook" do
+      output = ''
+      after_hook = lambda{ |browser| output << browser.text }
+
+      browser.after_hooks.add(after_hook)
+      browser.goto(WatirSpec.url_for("non_control_elements.html"))
+      expect(output).to include('Dubito, ergo cogito, ergo sum')
+
+      browser.after_hooks.delete(after_hook)
+      browser.goto(WatirSpec.url_for("definition_lists.html"))
+      expect(output).to_not include('definition_lists')
+    end
+  end
+
+  describe "#run" do
+    after(:each) do
+      browser.original_window.use
+      browser.after_hooks.delete @page_after_hook
+    end
+
+    it "runs after_hooks after Browser#goto" do
+      @page_after_hook = Proc.new { @yield = browser.title == "The font element" }
+      browser.after_hooks.add @page_after_hook
+      browser.goto WatirSpec.url_for("font.html")
+      expect(@yield).to be true
+    end
+
+    it "runs after_hooks after Browser#refresh" do
+      browser.goto WatirSpec.url_for("font.html")
+      @page_after_hook = Proc.new do
+        @yield = browser.title == "The font element"
+      end
+      browser.after_hooks.add @page_after_hook
+      browser.refresh
+      expect(@yield).to be true
+    end
+
+    it "runs after_hooks after Element#click" do
+      browser.goto(WatirSpec.url_for("non_control_elements.html"))
+      @page_after_hook = Proc.new do
+        browser.wait_until { |b| b.title == "Forms with input elements" }
+        @yield = true
+      end
+      browser.after_hooks.add @page_after_hook
+      browser.link(index: 2).click
+      expect(@yield).to be true
+    end
+
+    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.form(id: "new_user").submit
+        expect(@yield).to be true
+      end
+    end
+
+    bug "MoveTargetOutOfBoundsError", :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
+
+    not_compliant_on %i(remote 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 :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" }
+        browser.after_hooks.add @page_after_hook
+        browser.after_hooks.without { browser.button(id: 'alert').click }
+        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"))
+          @page_after_hook = Proc.new { @yield = browser.title == "Alerts" }
+          browser.after_hooks.add @page_after_hook
+          browser.after_hooks.without { browser.button(id: 'alert').click }
+          browser.alert.close
+          expect(@yield).to be true
+        end
+      end
+    end
+
+    not_compliant_on :safari, :headless do
+      it "does not run error checks with alert present" do
+        browser.goto WatirSpec.url_for("alerts.html")
+
+        @page_after_hook = Proc.new { @yield = browser.title == "Alerts" }
+        browser.after_hooks.add @page_after_hook
+
+        browser.button(id: "alert").click
+        expect(@yield).to be_nil
+
+        browser.alert.ok
+        expect(@yield).to eq true
+      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 }
+        browser.after_hooks.add @page_after_hook
+        browser.goto url
+        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 }
+        browser.after_hooks.add @page_after_hook
+        browser.goto url
+        browser.after_hooks.delete @page_after_hook
+        expect { browser.button(id: "alert").click }.to_not raise_error
+        browser.alert.ok
+      end
+    end
+
+    bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1223277", :firefox do
+      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.original_window.use
+        end
+      end
+    end
+  end
+end

data/spec/watirspec/alert_spec.rb

@@ -1,108 +1,108 @@
-require "watirspec_helper"
-
-not_compliant_on :headless do
-  describe 'Alert API' do
-    before do
-      browser.goto WatirSpec.url_for("alerts.html")
-    end
-
-    after do
-      browser.alert.ok if browser.alert.exists?
-    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
-
-        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
-        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
-        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
-
-      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
-
-          it 'raises error if alert is not present after timeout' do
-            begin
-              Watir.default_timeout = 2
-              expect {
-                browser.alert.wait_until_present.ok
-              }.to raise_error(Watir::Wait::TimeoutError)
-            ensure
-              Watir.default_timeout = 30
-            end
-          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
-      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
-      end
-    end
-  end
-end
+require "watirspec_helper"
+
+not_compliant_on :headless do
+  describe 'Alert API' do
+    before do
+      browser.goto WatirSpec.url_for("alerts.html")
+    end
+
+    after do
+      browser.alert.ok if browser.alert.exists?
+    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
+
+        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
+        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
+        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
+
+      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
+
+          it 'raises error if alert is not present after timeout' do
+            begin
+              Watir.default_timeout = 2
+              expect {
+                browser.alert.wait_until_present.ok
+              }.to raise_error(Watir::Wait::TimeoutError)
+            ensure
+              Watir.default_timeout = 30
+            end
+          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
+      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
+      end
+    end
+  end
+end