watir 6.16.2 → 6.18.0

data/spec/unit/match_elements/element_spec.rb

@@ -377,6 +377,8 @@ describe Watir::Locators::Element::Matcher do
       it 'not thrown when still matched by text content' do
         @values_to_match = {text: /some visible/}
         allow(browser).to receive(:execute_script).and_return('some visible some hidden')
+        allow(browser).to receive(:timer).and_return(Watir::Wait::Timer.new)
+        allow(browser).to receive(:timer=).and_return(Watir::Wait::Timer.new)
 
         expect {
           expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
@@ -386,31 +388,31 @@ describe Watir::Locators::Element::Matcher do
       it 'not thrown with complex regexp matched by text content' do
         @values_to_match = {text: /some (in|)visible/}
         allow(browser).to receive(:execute_script).and_return('some visible some hidden')
+        allow(browser).to receive(:timer).and_return(Watir::Wait::Timer.new)
+        allow(browser).to receive(:timer=).and_return(Watir::Wait::Timer.new)
 
         expect {
           expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
         }.not_to have_deprecated_text_regexp
       end
 
-      not_compliant_on :watigiri do
-        it 'thrown when no longer matched by text content' do
-          @values_to_match = {text: /some visible$/}
-          allow(browser).to receive(:execute_script).and_return('some visible some hidden')
+      it 'thrown when no longer matched by text content' do
+        @values_to_match = {text: /some visible$/}
+        allow(browser).to receive(:execute_script).and_return('some visible some hidden')
+        allow(browser).to receive(:timer).and_return(Watir::Wait::Timer.new)
+        allow(browser).to receive(:timer=).and_return(Watir::Wait::Timer.new)
 
-          expect {
-            expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
-          }.to have_deprecated_text_regexp
-        end
+        expect {
+          expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
+        }.to have_deprecated_text_regexp
       end
 
-      not_compliant_on :watigiri do
-        it 'not thrown when element does not exist' do
-          @values_to_match = {text: /definitely not there/}
+      it 'not thrown when element does not exist' do
+        @values_to_match = {text: /definitely not there/}
 
-          expect {
-            expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
-          }.to_not have_deprecated_text_regexp
-        end
+        expect {
+          expect(matcher.match(elements, values_to_match, filter)).to eq elements[1]
+        }.to_not have_deprecated_text_regexp
       end
 
       # Note: This will work after:text_regexp deprecation removed

data/spec/unit/selector_builder/button_spec.rb

@@ -7,10 +7,10 @@ describe Watir::Locators::Button::SelectorBuilder do
   let(:uppercase) { 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ' }
   let(:lowercase) { 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ' }
   let(:default_types) do
-    "translate(@type,'#{uppercase}','#{lowercase}')='button' or" \
-" translate(@type,'#{uppercase}','#{lowercase}')='reset' or"\
-" translate(@type,'#{uppercase}','#{lowercase}')='submit' or"\
-" translate(@type,'#{uppercase}','#{lowercase}')='image'"
+    "translate(@type,'#{uppercase}','#{lowercase}')=translate('button','#{uppercase}','#{lowercase}') or " \
+    "translate(@type,'#{uppercase}','#{lowercase}')=translate('reset','#{uppercase}','#{lowercase}') or "\
+    "translate(@type,'#{uppercase}','#{lowercase}')=translate('submit','#{uppercase}','#{lowercase}') or "\
+    "translate(@type,'#{uppercase}','#{lowercase}')=translate('image','#{uppercase}','#{lowercase}')"
   end
 
   describe '#build' do
@@ -36,9 +36,10 @@ describe Watir::Locators::Button::SelectorBuilder do
 
       it 'locates input or button element with specified type' do
         selector = {type: 'reset'}
+        type = "translate('reset','#{uppercase}','#{lowercase}')"
         built = {xpath: ".//*[(local-name()='button' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')='reset') or " \
-"(local-name()='input' and (translate(@type,'#{uppercase}','#{lowercase}')='reset'))]"}
+"translate(@type,'#{uppercase}','#{lowercase}')=#{type}) or " \
+"(local-name()='input' and (translate(@type,'#{uppercase}','#{lowercase}')=#{type}))]"}
         expect(selector_builder.build(selector)).to eq built
       end
 
@@ -75,35 +76,35 @@ describe Watir::Locators::Button::SelectorBuilder do
 
       it 'locates value of input element with simple Regexp' do
         selector = {text: /Button/}
-        built = {xpath: ".//*[(local-name()='button' and contains(text(), 'Button')) or " \
+        built = {xpath: ".//*[(local-name()='button' and contains(normalize-space(), 'Button')) or " \
 "(local-name()='input' and (#{default_types}) and contains(@value, 'Button'))]"}
         expect(selector_builder.build(selector)).to eq built
       end
 
       it 'locates text of button element with simple Regexp' do
         selector = {text: /Button 2/}
-        built = {xpath: ".//*[(local-name()='button' and contains(text(), 'Button 2')) or " \
+        built = {xpath: ".//*[(local-name()='button' and contains(normalize-space(), 'Button 2')) or " \
 "(local-name()='input' and (#{default_types}) and contains(@value, 'Button 2'))]"}
         expect(selector_builder.build(selector)).to eq built
       end
 
       it 'Simple Regexp for text' do
         selector = {text: /n 2/}
-        built = {xpath: ".//*[(local-name()='button' and contains(text(), 'n 2')) or " \
+        built = {xpath: ".//*[(local-name()='button' and contains(normalize-space(), 'n 2')) or " \
 "(local-name()='input' and (#{default_types}) and contains(@value, 'n 2'))]"}
         expect(selector_builder.build(selector)).to eq built
       end
 
       it 'Simple Regexp for value' do
         selector = {text: /Prev/}
-        built = {xpath: ".//*[(local-name()='button' and contains(text(), 'Prev')) or " \
+        built = {xpath: ".//*[(local-name()='button' and contains(normalize-space(), 'Prev')) or " \
 "(local-name()='input' and (#{default_types}) and contains(@value, 'Prev'))]"}
         expect(selector_builder.build(selector)).to eq built
       end
 
       it 'returns complex Regexp to the locator' do
         selector = {text: /^foo$/}
-        built = {xpath: ".//*[(local-name()='button' and contains(text(), 'foo')) or " \
+        built = {xpath: ".//*[(local-name()='button' and contains(normalize-space(), 'foo')) or " \
 "(local-name()='input' and (#{default_types}) and contains(@value, 'foo'))]", text: /^foo$/}
         expect(selector_builder.build(selector)).to eq built
       end
@@ -127,14 +128,14 @@ describe Watir::Locators::Button::SelectorBuilder do
       it 'input element value with simple Regexp' do
         selector = {value: /Prev/}
         built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
-"[contains(text(), 'Prev') or contains(@value, 'Prev')]"}
+"[contains(normalize-space(), 'Prev') or contains(@value, 'Prev')]"}
         expect(selector_builder.build(selector)).to eq built
       end
 
       it 'button element value with simple Regexp' do
         selector = {value: /on_2/}
         built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
-"[contains(text(), 'on_2') or contains(@value, 'on_2')]"}
+"[contains(normalize-space(), 'on_2') or contains(@value, 'on_2')]"}
         expect(selector_builder.build(selector)).to eq built
       end
 
@@ -148,14 +149,14 @@ describe Watir::Locators::Button::SelectorBuilder do
       it 'button element text with simple Regexp' do
         selector = {value: /ton 2/}
         built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
-"[contains(text(), 'ton 2') or contains(@value, 'ton 2')]"}
+"[contains(normalize-space(), 'ton 2') or contains(@value, 'ton 2')]"}
         expect(selector_builder.build(selector)).to eq built
       end
 
       it 'returns complex Regexp to the locator' do
         selector = {value: /^foo$/}
         built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
-"[contains(text(), 'foo') or contains(@value, 'foo')]", value: /^foo$/}
+"[contains(normalize-space(), 'foo') or contains(@value, 'foo')]", value: /^foo$/}
         expect(selector_builder.build(selector)).to eq built
       end
     end

data/spec/unit/selector_builder/element_spec.rb

@@ -51,7 +51,7 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'raises exception when not a String' do
         selector = {xpath: 7}
-        msg = /expected one of \[String\], got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String\], got 7:Integer/
 
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
@@ -81,7 +81,7 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'raises exception when not a String or Regexp' do
         selector = {tag_name: 7}
-        msg = /expected one of \[String, Regexp, Symbol\], got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp, Symbol\], got 7:Integer/
 
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
@@ -186,14 +186,14 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'raises exception when not a String or Regexp or Array' do
         selector = {class: 7}
-        msg = /expected one of \[String, Regexp, TrueClass, FalseClass\], got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp, TrueClass, FalseClass\], got 7:Integer/
 
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
 
       it 'raises exception when Array values are not a String or Regexp' do
         selector = {class: [7]}
-        msg = /expected one of \[String, Regexp, TrueClass, FalseClass\], got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp, TrueClass, FalseClass\], got 7:Integer/
 
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
@@ -244,14 +244,14 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'raises exception when attribute value is not a Boolean, String or Regexp' do
         selector = {foo: 7}
-        msg = /expected one of \[String, Regexp, TrueClass, FalseClass\], got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp, TrueClass, FalseClass\], got 7:Integer/
 
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
 
       it 'raises exception when attribute key is not a String or Regexp' do
         selector = {7 => 'foo'}
-        msg = /Unable to build XPath using 7:(Fixnum|Integer)/
+        msg = /Unable to build XPath using 7:Integer/
 
         expect { selector_builder.build(selector) }.to raise_exception Watir::Exception::LocatorException, msg
       end
@@ -292,7 +292,7 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'raises exception when text is not a String or Regexp' do
         selector = {text: 7}
-        msg = /expected one of \[String, Regexp\], got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp\], got 7:Integer/
 
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
@@ -574,7 +574,10 @@ describe Watir::Locators::Element::SelectorBuilder do
         selector = {action: /ME/i}
         built = {xpath: './/*[contains(translate(@action,' \
 "'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'," \
-"'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ'), 'me')]"}
+"'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ'), " \
+"translate('me'," \
+"'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'," \
+"'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ'))]"}
 
         expect(selector_builder.build(selector)).to eq built
       end
@@ -662,7 +665,7 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'raises exception when visible text is not a String or Regexp' do
         selector = {visible_text: 7}
-        msg = /expected one of \[String, Regexp\], got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp\], got 7:Integer/
 
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
@@ -762,5 +765,51 @@ describe Watir::Locators::Element::SelectorBuilder do
         expect(build_selector).to eq built
       end
     end
+
+    context 'with case-insensitive attributes' do
+      it 'respects case when locating uknown element with uknown attribute' do
+        expect(selector_builder.build(hreflang: 'en')).to eq(xpath: ".//*[@hreflang='en']")
+        expect(selector_builder.build(hreflang: /en/)).to eq(xpath: ".//*[contains(@hreflang, 'en')]")
+      end
+
+      it 'ignores case when locating uknown element with defined attribute' do
+        lhs = 'translate(@lang,' \
+  "'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'," \
+  "'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ')"
+        rhs = "translate('en'," \
+  "'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'," \
+  "'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ')"
+        expect(selector_builder.build(lang: 'en')).to eq(xpath: ".//*[#{lhs}=#{rhs}]")
+        expect(selector_builder.build(lang: /en/)).to eq(xpath: ".//*[contains(#{lhs}, #{rhs})]")
+        expect(selector_builder.build(tag_name: /a/, lang: 'en'))
+          .to eq(xpath: ".//*[contains(local-name(), 'a')][#{lhs}=#{rhs}]")
+        expect(selector_builder.build(tag_name: /a/, lang: /en/))
+          .to eq(xpath: ".//*[contains(local-name(), 'a')][contains(#{lhs}, #{rhs})]")
+      end
+
+      it 'ignores case when attribute is defined for element' do
+        lhs = 'translate(@hreflang,' \
+  "'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'," \
+  "'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ')"
+        rhs = "translate('en'," \
+  "'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'," \
+  "'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ')"
+        expect(selector_builder.build(tag_name: 'a', hreflang: 'en'))
+          .to eq(xpath: ".//*[local-name()='a'][#{lhs}=#{rhs}]")
+        expect(selector_builder.build(tag_name: 'a', hreflang: /en/))
+          .to eq(xpath: ".//*[local-name()='a'][contains(#{lhs}, #{rhs})]")
+      end
+
+      it 'respects case when attribute is not defined for element' do
+        expect(selector_builder.build(tag_name: 'table', hreflang: 'en'))
+          .to eq(xpath: ".//*[local-name()='table'][@hreflang='en']")
+        expect(selector_builder.build(tag_name: 'table', hreflang: /en/))
+          .to eq(xpath: ".//*[local-name()='table'][contains(@hreflang, 'en')]")
+        expect(selector_builder.build(tag_name: /a/, hreflang: 'en'))
+          .to eq(xpath: ".//*[contains(local-name(), 'a')][@hreflang='en']")
+        expect(selector_builder.build(tag_name: /a/, hreflang: /en/))
+          .to eq(xpath: ".//*[contains(local-name(), 'a')][contains(@hreflang, 'en')]")
+      end
+    end
   end
 end

data/spec/unit/selector_builder/text_field_spec.rb

@@ -7,18 +7,18 @@ describe Watir::Locators::TextField::SelectorBuilder do
   let(:uppercase) { 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ' }
   let(:lowercase) { 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ' }
   let(:negative_types) do
-    "translate(@type,'#{uppercase}','#{lowercase}')!='file' and "\
-"translate(@type,'#{uppercase}','#{lowercase}')!='radio' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='checkbox' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='submit' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='reset' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='image' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='button' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='hidden' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='range' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='color' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='date' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')!='datetime-local'"
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('file','#{uppercase}','#{lowercase}') and "\
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('radio','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('checkbox','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('submit','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('reset','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('image','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('button','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('hidden','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('range','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('color','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('date','#{uppercase}','#{lowercase}') and " \
+    "translate(@type,'#{uppercase}','#{lowercase}')!=translate('datetime-local','#{uppercase}','#{lowercase}')"
   end
 
   describe '#build' do
@@ -33,7 +33,7 @@ describe Watir::Locators::TextField::SelectorBuilder do
       it 'specified text field type that is text' do
         selector = {type: 'text'}
         built = {xpath: ".//*[local-name()='input']" \
-"[translate(@type,'#{uppercase}','#{lowercase}')='text']"}
+"[translate(@type,'#{uppercase}','#{lowercase}')=translate('text','#{uppercase}','#{lowercase}')]"}
 
         expect(selector_builder.build(selector)).to eq built
       end
@@ -41,7 +41,7 @@ describe Watir::Locators::TextField::SelectorBuilder do
       it 'specified text field type that is not text' do
         selector = {type: 'number'}
         built = {xpath: ".//*[local-name()='input']" \
-"[translate(@type,'#{uppercase}','#{lowercase}')='number']"}
+"[translate(@type,'#{uppercase}','#{lowercase}')=translate('number','#{uppercase}','#{lowercase}')]"}
 
         expect(selector_builder.build(selector)).to eq built
       end

data/spec/unit/unit_helper.rb

@@ -1,4 +1,2 @@
-require 'watirspec'
-WatirSpec::Runner.execute = false
-
-require_relative '../watirspec_helper'
+require 'spec_helper'
+require 'watirspec/support/rspec_matchers'

data/spec/watirspec/after_hooks_spec.rb

@@ -50,6 +50,8 @@ describe 'Browser::AfterHooks' do
   end
 
   describe '#run' do
+    before { @yield = nil }
+
     after(:each) do
       browser.original_window.use
       browser.after_hooks.delete @page_after_hook
@@ -83,7 +85,7 @@ describe 'Browser::AfterHooks' do
       expect(@yield).to be true
     end
 
-    not_compliant_on :safari do
+    bug 'https://gist.github.com/titusfortner/bd32f27ec2458b3a733d83374d156940', :safari do
       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' }
@@ -93,24 +95,24 @@ describe 'Browser::AfterHooks' do
       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 { @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
+    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.scroll.to
+      div.double_click
+      expect(@yield).to be true
     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 { @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
+    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.scroll.to
+      div.right_click
+      expect(@yield).to be true
     end
 
     it 'runs after_hooks after FramedDriver#switch!' do
@@ -135,70 +137,58 @@ describe 'Browser::AfterHooks' do
       expect(@yield).to be true
     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 { @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
 
-    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 { @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
+    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
 
-    not_compliant_on :safari, :headless do
-      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 eq true
     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 { 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 } }.to_not raise_error
+      browser.alert.ok
     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 { 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 }.to_not raise_error
+      browser.alert.ok
     end
 
-    bug 'https://bugzilla.mozilla.org/show_bug.cgi?id=1223277', :firefox do
-      not_compliant_on :headless do
+    bug 'Clicking an Element that Closes a Window is returning NoMatchingWindowFoundException', :safari do
+      bug 'https://github.com/mozilla/geckodriver/issues/1847', :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 { browser.url }