WIP - this is drastic, but does it fix it?

Author: titusfortner

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

@@ -21,8 +21,14 @@
 
 module Selenium
   module WebDriver
-    describe ActionBuilder, exclusive: {bidi: false, reason: 'Not yet implemented with BiDi'} do
-      after { driver.action.clear_all_actions }
+    describe ActionBuilder, exclusive: { bidi: false, reason: 'Not yet implemented with BiDi' } do
+      after do
+        if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome
+          reset_driver!
+        else
+          driver.action.clear_all_actions
+        end
+      end
 
       describe '#send_keys' do
         it 'sends keys to the active element', except: {browser: %i[safari safari_preview]} do
@@ -172,9 +178,6 @@ module WebDriver
                 .pointer_down(:left).pointer_up(:left)
                 .perform
           expect(element.property(:value)).to eq('DoubleClicked')
-        ensure
-          # https://issues.chromium.org/issues/400087471
-          reset_driver! if GlobalTestEnv.browser == :chrome && GlobalTestEnv.rbe?
         end
       end
 

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

@@ -25,10 +25,12 @@ module WebDriver
       it_behaves_like 'driver that can be started concurrently', exclude: [
         {browser: %i[safari safari_preview]},
         {browser: :firefox, rbe: true, reason: 'https://github.com/mozilla/geckodriver/issues/2219'},
-        {driver: :remote, rbe: true, reason: 'Cannot start 2+ drivers at once.'}
+        {driver: :remote, rbe: true, reason: 'Cannot start 2+ drivers at once.' }
       ]
 
-      it 'creates default capabilities', exclude: {browser: %i[safari safari_preview]} do
+      after { reset_driver! if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome }
+
+      it 'creates default capabilities', exclude: { browser: %i[safari safari_preview] } do
         reset_driver! do |driver|
           caps = driver.capabilities
           expect(caps.proxy).to be_nil
@@ -60,8 +62,7 @@ module WebDriver
 
       it 'refreshes the page' do
         driver.navigate.to url_for('javascriptPage.html')
-        sleep 1 # javascript takes too long to load
-        driver.find_element(id: 'updatediv').click
+        short_wait { driver.find_element(id: 'updatediv') }.click
         expect(driver.find_element(id: 'dynamo').text).to eq('Fish and chips!')
         driver.navigate.refresh
         wait_for_element(id: 'dynamo')

rb/spec/integration/selenium/webdriver/select_spec.rb

@@ -29,6 +29,7 @@ module Support
         let(:multi_disabled) { described_class.new(driver.find_element(name: 'multi_disabled')) }
 
         before { driver.navigate.to url_for('formPage.html') }
+        after { reset_driver! if GlobalTestEnv.rbe? && GlobalTestEnv.browser == :chrome }
 
         describe '#initialize' do
           it 'raises exception if not a select element' do

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

@@ -89,9 +89,6 @@ module WebDriver
             expect {
               driver.switch_to.new_window(:unknown)
             }.to raise_error(ArgumentError)
-          ensure
-            # https://issues.chromium.org/issues/400087471
-            reset_driver! if GlobalTestEnv.browser == :chrome && GlobalTestEnv.rbe?
           end
 
           it 'switches to the new window then close it when given a block' do