watir 7.2.0 → 7.2.1

data/spec/watirspec/after_hooks_spec.rb

@@ -2,201 +2,203 @@
 
 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
+module Watir
+  describe 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
+        proc = proc { |browser| @output = browser.text }
 
-    it 'runs the given proc on each page load' do
-      proc = proc { |browser| @output = browser.text }
+        begin
+          browser.alert.dismiss if browser.alert.exists?
+          browser.after_hooks.add(proc)
+          browser.goto(WatirSpec.url_for('non_control_elements.html'))
 
-      begin
-        browser.alert.dismiss if browser.alert.exists?
-        browser.after_hooks.add(proc)
+          expect(@output).to include('Dubito, ergo cogito, ergo sum')
+        ensure
+          browser.after_hooks.delete(proc)
+        end
+      end
+
+      it 'runs the given block on each page load' do
+        browser.after_hooks.add { |browser| @output = browser.text }
         browser.goto(WatirSpec.url_for('non_control_elements.html'))
 
         expect(@output).to include('Dubito, ergo cogito, ergo sum')
       ensure
-        browser.after_hooks.delete(proc)
+        browser.after_hooks.delete browser.after_hooks[0]
       end
     end
 
-    it 'runs the given block on each page load' do
-      browser.after_hooks.add { |browser| @output = browser.text }
-      browser.goto(WatirSpec.url_for('non_control_elements.html'))
+    describe '#delete' do
+      it 'removes a previously added after_hook' do
+        after_hook = ->(browser) { @output = browser.text }
 
-      expect(@output).to include('Dubito, ergo cogito, ergo sum')
-    ensure
-      browser.after_hooks.delete browser.after_hooks[0]
-    end
-  end
-
-  describe '#delete' do
-    it 'removes a previously added after_hook' do
-      after_hook = ->(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.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')
+        browser.after_hooks.delete(after_hook)
+        browser.goto(WatirSpec.url_for('definition_lists.html'))
+        expect(@output).not_to include('definition_lists')
+      end
     end
-  end
 
-  describe '#run' do
-    before { @yield = nil }
+    describe '#run' do
+      before { @yield = nil }
 
-    after(:each) do
-      browser.after_hooks.delete @page_after_hook
-    end
+      after do
+        browser.after_hooks.delete @page_after_hook
+      end
 
-    it 'runs after_hooks after Browser#goto' do
-      @page_after_hook = proc { @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#goto' do
+        @page_after_hook = proc { @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 do
-        @yield = browser.title == 'The font element'
+      it 'runs after_hooks after Browser#refresh' do
+        browser.goto WatirSpec.url_for('font.html')
+        @page_after_hook = proc do
+          @yield = browser.title == 'The font element'
+        end
+        browser.after_hooks.add @page_after_hook
+        browser.refresh
+        expect(@yield).to be true
       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 do
-        browser.wait_until { |b| b.title == 'Forms with input elements' }
-        @yield = true
+      it 'runs after_hooks after Element#click' do
+        browser.goto(WatirSpec.url_for('non_control_elements.html'))
+        @page_after_hook = proc 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
-      browser.after_hooks.add @page_after_hook
-      browser.link(index: 2).click
-      expect(@yield).to be true
-    end
 
-    it 'runs after_hooks after Element#submit' do
-      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-      @page_after_hook = proc { @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
+      it 'runs after_hooks after Element#submit' do
+        browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
+        @page_after_hook = proc { @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
 
-    it 'runs after_hooks after Element#double_click' do
-      browser.goto(WatirSpec.url_for('non_control_elements.html'))
-      @page_after_hook = proc { @yield = browser.title == 'Non-control elements' }
-      browser.after_hooks.add @page_after_hook
-      div = browser.div(id: 'html_test')
-      div.double_click
-      expect(@yield).to be true
-    end
+      it 'runs after_hooks after Element#double_click' do
+        browser.goto(WatirSpec.url_for('non_control_elements.html'))
+        @page_after_hook = proc { @yield = browser.title == 'Non-control elements' }
+        browser.after_hooks.add @page_after_hook
+        div = browser.div(id: 'html_test')
+        div.double_click
+        expect(@yield).to be true
+      end
 
-    it 'runs after_hooks after Element#right_click' do
-      browser.goto(WatirSpec.url_for('right_click.html'))
-      @page_after_hook = proc { @yield = browser.title == 'Right Click Test' }
-      browser.after_hooks.add @page_after_hook
-      div = browser.div(id: 'click')
-      div.right_click
-      expect(@yield).to be true
-    end
+      it 'runs after_hooks after Element#right_click' do
+        browser.goto(WatirSpec.url_for('right_click.html'))
+        @page_after_hook = proc { @yield = browser.title == 'Right Click Test' }
+        browser.after_hooks.add @page_after_hook
+        div = browser.div(id: 'click')
+        div.right_click
+        expect(@yield).to be true
+      end
 
-    it 'runs after_hooks after Alert#ok' do
-      browser.goto(WatirSpec.url_for('alerts.html'))
-      @page_after_hook = proc { @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
+      it 'runs after_hooks after Alert#ok' do
+        browser.goto(WatirSpec.url_for('alerts.html'))
+        @page_after_hook = proc { @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
 
-    it 'runs after_hooks after Alert#close' do
-      browser.goto(WatirSpec.url_for('alerts.html'))
-      @page_after_hook = proc { @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
+      it 'runs after_hooks after Alert#close' do
+        browser.goto(WatirSpec.url_for('alerts.html'))
+        @page_after_hook = proc { @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
 
-    it 'does not run error checks with alert present' do
-      browser.goto WatirSpec.url_for('alerts.html')
+      it 'does not run error checks with alert present' do
+        browser.goto WatirSpec.url_for('alerts.html')
 
-      @page_after_hook = proc { @yield = browser.title == 'Alerts' }
-      browser.after_hooks.add @page_after_hook
+        @page_after_hook = proc { @yield = browser.title == 'Alerts' }
+        browser.after_hooks.add @page_after_hook
 
-      browser.button(id: 'alert').click
-      expect(@yield).to be_nil
+        browser.button(id: 'alert').click
+        expect(@yield).to be_nil
 
-      browser.alert.ok
-      expect(@yield).to eq true
-    end
+        browser.alert.ok
+        expect(@yield).to be true
+      end
 
-    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 { 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
+      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 { browser.url }
+        browser.after_hooks.add @page_after_hook
+        browser.goto url
+        expect { browser.after_hooks.without { browser.button(id: 'alert').click } }.not_to raise_error
+        browser.alert.ok
+      end
 
-    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 { 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
+      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 { 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 }.not_to raise_error
+        browser.alert.ok
+      end
 
-    it 'does not raise error when running error checks on closed window',
-       exclude: [{browser: :safari,
-                  reason: 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException'},
-                 {browser: :firefox,
-                  platform: :windows,
-                  reason: 'https://github.com/mozilla/geckodriver/issues/1847'},
-                 {browser: :ie,
-                  reason: 'IE and windows do not play well together'}] do
-      url = WatirSpec.url_for('window_switching.html')
-      @page_after_hook = proc { 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
+      it 'does not raise error when running error checks on closed window',
+         exclude: [{browser: :safari,
+                    reason: 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException'},
+                   {browser: :firefox,
+                    platform: :windows,
+                    reason: 'https://github.com/mozilla/geckodriver/issues/1847'},
+                   {browser: :ie,
+                    reason: 'IE and windows do not play well together'}] do
+        url = WatirSpec.url_for('window_switching.html')
+        @page_after_hook = proc { 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 }.not_to raise_error
+        browser.original_window.use
+      end
     end
-  end
 
-  describe '#length' do
-    it 'provides the number of after hooks' do
-      hook = proc { true }
-      begin
-        4.times { browser.after_hooks.add(hook) }
-        expect(browser.after_hooks.length).to eq 4
-      ensure
-        4.times { browser.after_hooks.delete(hook) }
+    describe '#length' do
+      it 'provides the number of after hooks' do
+        hook = proc { true }
+        begin
+          4.times { browser.after_hooks.add(hook) }
+          expect(browser.after_hooks.length).to eq 4
+        ensure
+          4.times { browser.after_hooks.delete(hook) }
+        end
       end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the after hook at the provided index' do
-      hook1 = proc { true }
-      hook2 = proc { false }
-      browser.after_hooks.add(hook1)
-      browser.after_hooks.add(hook2)
-      expect(browser.after_hooks[1]).to eq hook2
+    describe '#[]' do
+      it 'returns the after hook at the provided index' do
+        hook1 = proc { true }
+        hook2 = proc { false }
+        browser.after_hooks.add(hook1)
+        browser.after_hooks.add(hook2)
+        expect(browser.after_hooks[1]).to eq hook2
+      end
     end
   end
 end

data/spec/watirspec/alert_spec.rb

@@ -2,84 +2,87 @@
 
 require 'watirspec_helper'
 
-describe 'Alert API' do
-  before do
-    browser.goto WatirSpec.url_for('alerts.html')
-  end
-
-  after do
-    browser.alert.ok if browser.alert.exists?
-  end
+module Watir
+  describe Alert do
+    before do
+      browser.goto WatirSpec.url_for('alerts.html')
+    end
 
-  context '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
+    after do
+      browser.alert.ok if browser.alert.exists?
     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')
+    describe '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
 
-    describe '#exists?' do
-      it 'returns false if alert is not present' do
-        expect(browser.alert).to_not exist
+    describe '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
 
-      it 'returns true if alert is present' do
-        browser.button(id: 'alert').click
-        browser.wait_until(timeout: 10) { browser.alert.exists? }
+      describe '#exists?' do
+        it 'returns false if alert is not present' do
+          expect(browser.alert).not_to exist
+        end
+
+        it 'returns true if alert is present' do
+          browser.button(id: 'alert').click
+          browser.wait_until(timeout: 10) { browser.alert.exists? }
+          expect(browser.alert.exist?).to be true
+        end
       end
-    end
 
-    describe '#ok' do
-      it 'closes alert' do
-        browser.button(id: 'alert').click
-        browser.alert.ok
-        expect(browser.alert).to_not exist
+      describe '#ok' do
+        it 'closes alert' do
+          browser.button(id: 'alert').click
+          browser.alert.ok
+          expect(browser.alert).not_to 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
+      describe '#close' do
+        it 'closes alert' do
+          browser.button(id: 'alert').click
+          browser.alert.close
+          expect(browser.alert).not_to exist
+        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'
+    describe '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
-    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'
+      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
-  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'
+    describe '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