Clean up guards for specs passing against remote

Author: p0deje

rb/spec/integration/selenium/webdriver/driver_spec.rb

@@ -294,7 +294,7 @@ def save_screenshot_and_assert(path)
         end
 
         # Edge BUG - https://connect.microsoft.com/IE/feedback/details/1849991/
-        it 'times out if the callback is not invoked', except: [{browser: :edge}, {driver: :remote, platform: :macosx}] do
+        it 'times out if the callback is not invoked', except: [{browser: :edge}] do
           expect do
             # Script is expected to be async and explicitly callback, so this should timeout.
             driver.execute_async_script 'return 1 + 2;'

rb/spec/integration/selenium/webdriver/error_spec.rb

@@ -21,8 +21,7 @@
 
 module Selenium
   module WebDriver
-    # https://github.com/SeleniumHQ/selenium/issues/3338
-    describe Error, except: {driver: :remote, platform: :macosx} do
+    describe Error do
       it 'should raise an appropriate error' do
         driver.navigate.to url_for('xhtmlTest.html')
 

rb/spec/integration/selenium/webdriver/target_locator_spec.rb

@@ -177,8 +177,7 @@ module WebDriver
           expect(driver.title).to eq('We Arrive Here')
         end
 
-        # https://github.com/SeleniumHQ/selenium/issues/3339
-        it 'should iterate over open windows when current window is closed', except: {driver: :remote} do
+        it 'should iterate over open windows when current window is closed' do
           driver.navigate.to url_for('xhtmlTest.html')
           wait_for_element(link: 'Create a new anonymous window')
           driver.find_element(link: 'Create a new anonymous window').click
@@ -199,8 +198,7 @@ module WebDriver
         end
       end
 
-      # https://github.com/SeleniumHQ/selenium/issues/3339
-      it 'should switch to a window and execute a block when current window is closed', except: [{browser: :safari}, {driver: :remote}] do
+      it 'should switch to a window and execute a block when current window is closed', except: {browser: :safari} do
         driver.navigate.to url_for('xhtmlTest.html')
         driver.find_element(link: 'Open new window').click
         wait.until { driver.window_handles.size == 2 }
@@ -275,8 +273,7 @@ module WebDriver
           wait_for_no_alert
         end
 
-        # https://github.com/SeleniumHQ/selenium/issues/3340
-        it 'raises when calling #text on a closed alert', except: {driver: :remote, platform: :macosx} do
+        it 'raises when calling #text on a closed alert' do
           driver.navigate.to url_for('alerts.html')
           wait_for_element(id: 'alert')
 
@@ -289,8 +286,7 @@ module WebDriver
           expect { alert.text }.to raise_error(Selenium::WebDriver::Error::NoSuchAlertError)
         end
 
-        # https://github.com/SeleniumHQ/selenium/issues/3340
-        it 'raises NoAlertOpenError if no alert is present', except: [{driver: :remote, platform: :macosx}, {browser: :ie}] do
+        it 'raises NoAlertOpenError if no alert is present', except: {browser: :ie} do
           expect { driver.switch_to.alert }.to raise_error(Selenium::WebDriver::Error::NoSuchAlertError, /alert|modal/i)
         end
 

rb/spec/integration/selenium/webdriver/timeout_spec.rb

@@ -37,14 +37,12 @@ module WebDriver
           driver.find_element(id: 'box0')
         end
 
-        # https://github.com/SeleniumHQ/selenium/issues/3338
-        it 'should still fail to find an element with implicit waits enabled', except: {driver: :remote, platform: :macosx} do
+        it 'should still fail to find an element with implicit waits enabled' do
           driver.manage.timeouts.implicit_wait = 0.5
           expect { driver.find_element(id: 'box0') }.to raise_error(WebDriver::Error::NoSuchElementError)
         end
 
-        # https://github.com/SeleniumHQ/selenium/issues/3338
-        it 'should return after first attempt to find one after disabling implicit waits', except: {driver: :remote, platform: :macosx} do
+        it 'should return after first attempt to find one after disabling implicit waits' do
           driver.manage.timeouts.implicit_wait = 3
           driver.manage.timeouts.implicit_wait = 0