[rb] fix tests and guards

Author: titusfortner

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

@@ -321,7 +321,7 @@ module WebDriver
 
       describe '#scroll_by' do
         it 'scrolls by given amount',
-           exclude: {driver: :firefox, reason: 'inconsistent behavior between versions'} do
+           exclude: {browser: :firefox, reason: 'inconsistent behavior between versions'} do
           driver.navigate.to url_for('scrolling_tests/frame_with_nested_scrolling_frame_out_of_view.html')
           footer = driver.find_element(tag_name: 'footer')
           delta_y = footer.rect.y.round

rb/spec/integration/selenium/webdriver/devtools_spec.rb

@@ -21,8 +21,7 @@
 
 module Selenium
   module WebDriver
-    describe DevTools, exclusive: [{bidi: false, reason: 'Not yet implemented with BiDi'},
-                                   {browser: %i[chrome edge]}] do
+    describe DevTools, exclusive: {browser: %i[chrome edge]} do
       after { |example| reset_driver!(example: example) }
 
       it 'sends commands' do

rb/spec/integration/selenium/webdriver/edge/sample.crx

@@ -42,7 +42,9 @@ module Remote
           wait.until { driver.find_element(id: 'upload_label').displayed? }
 
           driver.switch_to.frame('upload_target')
-          wait.until { driver.find_element(xpath: '//body') }
+          wait(ignore: [Error::NoSuchElementError, Error::StaleElementReferenceError]).until do
+            !driver.find_element(xpath: '//body').text.empty?
+          end
 
           body = driver.find_element(xpath: '//body')
           expect(body.text.scan('This is a dummy test file').count).to eq(1)
@@ -83,8 +85,7 @@ module Remote
           end
         end
 
-        it 'errors when not set', {except: {browser: :firefox, reason: 'grid always sets true and firefox returns it'},
-                                   exclude: {browser: :safari, reason: 'grid hangs'}} do
+        it 'errors when not set', {exclude: {browser: :safari, reason: 'grid hangs'}} do
           reset_driver!(enable_downloads: false) do |driver|
             expect {
               driver.downloadable_files

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

@@ -97,8 +97,8 @@ def wait_for_new_url(old_url)
           end
         end
 
-        def wait(timeout = 10)
-          Wait.new(timeout: timeout)
+        def wait(timeout = 10, **opts)
+          Wait.new(timeout: timeout, **opts)
         end
 
         def png_size(path)

rb/spec/integration/selenium/webdriver/spec_support/helpers.rb

@@ -107,7 +107,7 @@ def call(env)
             case env['PATH_INFO']
             when '/upload'
               req = Rack::Request.new(env)
-              body = case req['upload']
+              body = case req.params['upload']
                      when Array
                        req.params['upload'].map { |upload| upload[:tempfile].read }.join("\n")
                      when Hash