Unguard tests passing with standalone 3.5

Author: p0deje

rb/spec/integration/selenium/webdriver/action_builder_spec.rb

@@ -21,8 +21,8 @@
 
 module Selenium
   module WebDriver
-    describe ActionBuilder, except: [{browser: :safari}, {browser: %i[firefox ff_nightly], driver: :remote}] do
-      after { driver.action.instance_variable_set(:@actions, []) }
+    describe ActionBuilder, except: {browser: :safari} do
+      after { reset_driver! }
 
       describe 'Key actions' do
         it 'sends keys to the active element' do
@@ -103,7 +103,7 @@ module WebDriver
           expect(input.attribute(:value)).to eq('abcd')
         end
 
-        it 'can release pressed keys via release action', only: {driver: %i[firefox ff_nightly]} do
+        it 'can release pressed keys via release action', only: {browser: %i[firefox ff_nightly]} do
           driver.navigate.to url_for('javascriptPage.html')
 
           event_input = driver.find_element(id: 'theworks')
@@ -146,7 +146,7 @@ module WebDriver
         end
 
         # Pending bug with Firefox
-        it 'double clicks an element', except: {driver: %i[firefox ff_nightly]} do
+        it 'double clicks an element', except: {browser: %i[firefox ff_nightly]} do
           driver.navigate.to url_for('javascriptPage.html')
           element = driver.find_element(id: 'doubleClickField')
 
@@ -162,7 +162,7 @@ module WebDriver
           expect(element.attribute(:value)).to eq('ContextClicked')
         end
 
-        it 'can release pressed buttons via release action', only: {driver: %i[firefox ff_nightly]} do
+        it 'can release pressed buttons via release action', only: {browser: %i[firefox ff_nightly]} do
           driver.navigate.to url_for('javascriptPage.html')
 
           event_input = driver.find_element(id: 'clickField')

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

@@ -22,7 +22,7 @@
 module Selenium
   module WebDriver
     describe Firefox, only: {browser: %i[ff_esr firefox ff_nightly]} do
-      it 'creates default capabilities (W3C)', except: [{driver: :remote}, {browser: :ff_esr}] do
+      it 'creates default capabilities (W3C)', except: {browser: :ff_esr} do
         create_driver! do |driver|
           caps = driver.capabilities
           expect(caps.proxy).to be_nil

rb/spec/integration/selenium/webdriver/options_spec.rb

@@ -72,15 +72,15 @@ module WebDriver
         end
 
         # IE - Command not implemented
-        it 'should get named cookie', except: {driver: :ie} do
+        it 'should get named cookie', except: [{driver: :ie}, {browser: :firefox}] do
           driver.navigate.to url_for('xhtmlTest.html')
           driver.manage.add_cookie name: 'foo', value: 'bar'
 
           expect(driver.manage.cookie_named('foo')[:value]).to eq('bar')
         end
 
         # Edge BUG - https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/5751773/
-        it 'should delete one', except: {browser: :edge} do
+        it 'should delete one', except: [{browser: :edge}, [driver: :firefox]] do
           driver.navigate.to url_for('xhtmlTest.html')
           driver.manage.add_cookie name: 'foo', value: 'bar'
 
@@ -98,7 +98,7 @@ module WebDriver
         end
 
         # IE - Command not implemented
-        it 'should use DateTime for expires', except: {browser: :ie} do
+        it 'should use DateTime for expires', except: {browser: %i[firefox ie]} do
           driver.navigate.to url_for('xhtmlTest.html')
 
           expected = DateTime.new(2039)

rb/spec/integration/selenium/webdriver/remote/element_spec.rb

@@ -30,7 +30,7 @@ module WebDriver
         driver.file_detector = nil
       end
 
-      it 'uses the file detector', only: {browser: %i[chrome ff_esr firefox ff_nightly]} do
+      it 'uses the file detector' do
         driver.navigate.to url_for('upload.html')
 
         driver.find_element(id: 'upload').send_keys('random string')

rb/spec/integration/selenium/webdriver/storage_spec.rb

@@ -22,8 +22,7 @@
 module Selenium
   module WebDriver
     module DriverExtensions
-      # TODO - Find out what settings for turning on web storage in remote server
-      describe HasWebStorage, only: {browser: %i[chrome firefox ff_nightly]}, except: {driver: :remote} do
+      describe HasWebStorage, only: {browser: %i[chrome firefox ff_nightly]} do
         shared_examples_for 'web storage' do
           before do
             driver.navigate.to url_for('clicks.html')

rb/spec/integration/selenium/webdriver/w3c_action_builder_spec.rb

@@ -21,8 +21,14 @@
 
 module Selenium
   module WebDriver
-    describe W3CActionBuilder, only: {driver: :ff_nightly} do
-      after { driver.action.clear_all_actions }
+    describe W3CActionBuilder, only: {browser: %i[firefox ff_nightly]} do
+      after do
+        if driver.action.respond_to?(:clear_all_actions)
+          driver.action.clear_all_actions
+        else
+          driver.action.instance_variable_set(:@actions, [])
+        end
+      end
 
       describe 'Key actions' do
         it 'can release pressed keys via release action' do
@@ -44,12 +50,12 @@ module WebDriver
       end # Key actions
 
       describe 'Pointer actions' do
-        it 'can release pressed buttons via release action', except: {driver: :ff_nightly} do
+        it 'can release pressed buttons via release action', except: {browser: :ff_nightly} do
           driver.navigate.to url_for('javascriptPage.html')
 
           event_input = driver.find_element(id: 'clickField')
 
-          driver.action.pointer_down(event_input).perform
+          driver.action.move_to(event_input).pointer_down(:left).perform
           expect(event_input.attribute(:value)).to eq('Hello')
 
           driver.action.release_actions

rb/spec/integration/selenium/webdriver/window_spec.rb

@@ -72,8 +72,7 @@ module WebDriver
         expect(new_pos.y).to eq(target_y)
       end
 
-      # remote responds to OSS protocol which doesn't support rect commands
-      context 'window rect', except: {driver: :remote}, only: {browser: %i[firefox ff_nightly]} do
+      context 'window rect', only: {browser: %i[firefox ff_nightly]} do
         it 'gets the rect of the current window' do
           rect = driver.manage.window.rect