revert the workarounds to try again

Author: titusfortner

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

@@ -22,7 +22,7 @@
 module Selenium
   module WebDriver
     describe ActionBuilder, exclusive: {bidi: false, reason: 'Not yet implemented with BiDi'} do
-      after { reset_driver! }
+      after { driver.action.clear_all_actions }
 
       describe '#send_keys' do
         it 'sends keys to the active element', except: {browser: %i[safari safari_preview]} do

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

@@ -337,7 +337,6 @@ module WebDriver
 
         it 'is able to pass element arguments' do
           driver.navigate.to url_for('javascriptPage.html')
-          short_wait.until { driver.find_element(id: 'plainButton') }
           button = driver.find_element(id: 'plainButton')
           js = "arguments[0]['flibble'] = arguments[0].getAttribute('id'); return arguments[0]['flibble'];"
           expect(driver.execute_script(js, button))

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

@@ -24,7 +24,14 @@ module WebDriver
     describe TargetLocator, exclusive: {bidi: false, reason: 'Not yet implemented with BiDi'} do
       before { @original_window = driver.window_handle }
 
-      after { reset_driver! }
+      after do
+        handles = driver.window_handles
+        driver.switch_to.window(@original_window) if handles.include?(@original_window)
+
+        (handles - [driver.window_handle]).each do |handle|
+          driver.switch_to.window(handle) { driver.close }
+        end
+      end
 
       let(:new_window) { driver.window_handles.find { |handle| handle != driver.window_handle } }
 
@@ -82,8 +89,6 @@ module WebDriver
             expect {
               driver.switch_to.new_window(:unknown)
             }.to raise_error(ArgumentError)
-          ensure
-            reset_driver!
           end
 
           it 'switches to the new window then close it when given a block' do