[rb] add bidi tests to rbe

Author: titusfortner

rb/spec/BUILD.bazel

@@ -37,6 +37,8 @@ rb_library(
         "//rb/spec/integration/selenium/webdriver:zipper",
         "//rb/spec/integration/selenium/webdriver/bidi:browsing_context",
         "//rb/spec/integration/selenium/webdriver/bidi:log_inspector",
+        "//rb/spec/integration/selenium/webdriver/bidi:network",
+        "//rb/spec/integration/selenium/webdriver/bidi:script",
         "//rb/spec/integration/selenium/webdriver/chrome:driver",
         "//rb/spec/integration/selenium/webdriver/chrome:options",
         "//rb/spec/integration/selenium/webdriver/chrome:profile",

rb/spec/integration/selenium/webdriver/bidi/browsing_context_spec.rb

@@ -75,56 +75,46 @@ class BiDi
         end
 
         it 'sets the viewport' do
-          reset_driver!(web_socket_url: true) do |driver|
-            browsing_context = described_class.new(driver)
-            browsing_context.set_viewport(width: 800, height: 600, device_pixel_ratio: 2.0)
-            expect(driver.execute_script('return [window.innerWidth, window.innerHeight]')).to eq([800, 600])
-            expect(driver.execute_script('return window.devicePixelRatio')).to eq(2.0)
-          end
+          browsing_context = described_class.new(driver)
+          browsing_context.set_viewport(width: 800, height: 600, device_pixel_ratio: 2.0)
+          expect(driver.execute_script('return [window.innerWidth, window.innerHeight]')).to eq([800, 600])
+          expect(driver.execute_script('return window.devicePixelRatio')).to eq(2.0)
         end
 
         it 'accepts users prompts without text' do
-          reset_driver!(web_socket_url: true) do |driver|
-            browsing_context = described_class.new(driver)
-            window = browsing_context.create
+          browsing_context = described_class.new(driver)
+          window = browsing_context.create
 
-            browsing_context.handle_user_prompt(window, accept: true)
+          browsing_context.handle_user_prompt(window, accept: true)
 
-            expect(driver.page_source).to include('hello')
-          end
+          expect(driver.page_source).to include('hello')
         end
 
         it 'accepts users prompts with text' do
-          reset_driver!(web_socket_url: true) do |driver|
-            browsing_context = described_class.new(driver)
-            window = browsing_context.create
+          browsing_context = described_class.new(driver)
+          window = browsing_context.create
 
-            browsing_context.handle_user_prompt(window, accept: true, text: 'Hello, world!')
+          browsing_context.handle_user_prompt(window, accept: true, text: 'Hello, world!')
 
-            expect(driver.page_source).to include('hello')
-          end
+          expect(driver.page_source).to include('hello')
         end
 
         it 'rejects users prompts' do
-          reset_driver!(web_socket_url: true) do |driver|
-            browsing_context = described_class.new(driver)
-            window = browsing_context.create
+          browsing_context = described_class.new(driver)
+          window = browsing_context.create
 
-            browsing_context.handle_user_prompt(window, accept: false)
+          browsing_context.handle_user_prompt(window, accept: false)
 
-            expect(driver.page_source).to include('goodbye')
-          end
+          expect(driver.page_source).to include('goodbye')
         end
 
         it 'activates a browser context' do
-          reset_driver!(web_socket_url: true) do |driver|
-            browsing_context = described_class.new(driver)
-            browsing_context.create
+          browsing_context = described_class.new(driver)
+          browsing_context.create
 
-            expect(driver.execute_script('return document.hasFocus();')).to be_falsey
-            browsing_context.activate
-            expect(driver.execute_script('return document.hasFocus();')).to be_truthy
-          end
+          expect(driver.execute_script('return document.hasFocus();')).to be_falsey
+          browsing_context.activate
+          expect(driver.execute_script('return document.hasFocus();')).to be_truthy
         end
       end
     end # BiDi

rb/spec/integration/selenium/webdriver/bidi/network_spec.rb

@@ -25,174 +25,148 @@ class BiDi
       describe Network, exclusive: {bidi: true, reason: 'only executed when bidi is enabled'},
                         only: {browser: %i[chrome edge firefox]} do
         it 'adds an intercept' do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            intercept = network.add_intercept(phases: [described_class::PHASES[:before_request]])
-            expect(intercept).not_to be_nil
-          end
+          network = described_class.new(driver.bidi)
+          intercept = network.add_intercept(phases: [described_class::PHASES[:before_request]])
+          expect(intercept).not_to be_nil
         end
 
         it 'adds an intercept with a default pattern type' do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            pattern = 'http://localhost:4444/formPage.html'
-            intercept = network.add_intercept(phases: [described_class::PHASES[:before_request]], url_patterns: pattern)
-            expect(intercept).not_to be_nil
-          end
+          network = described_class.new(driver.bidi)
+          pattern = 'http://localhost:4444/formPage.html'
+          intercept = network.add_intercept(phases: [described_class::PHASES[:before_request]], url_patterns: pattern)
+          expect(intercept).not_to be_nil
         end
 
         it 'adds an intercept with a url pattern' do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            pattern = 'http://localhost:4444/formPage.html'
-            intercept = network.add_intercept(phases: [described_class::PHASES[:before_request]],
-                                              url_patterns: pattern,
-                                              pattern_type: :url)
-            expect(intercept).not_to be_nil
-          end
+          network = described_class.new(driver.bidi)
+          pattern = 'http://localhost:4444/formPage.html'
+          intercept = network.add_intercept(phases: [described_class::PHASES[:before_request]],
+                                            url_patterns: pattern,
+                                            pattern_type: :url)
+          expect(intercept).not_to be_nil
         end
 
         it 'removes an intercept' do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            intercept = network.add_intercept(phases: [described_class::PHASES[:before_request]])
-            expect(network.remove_intercept(intercept['intercept'])).to be_empty
-          end
+          network = described_class.new(driver.bidi)
+          intercept = network.add_intercept(phases: [described_class::PHASES[:before_request]])
+          expect(network.remove_intercept(intercept['intercept'])).to be_empty
         end
 
         it 'continues with auth' do
           username = SpecSupport::RackServer::TestApp::BASIC_AUTH_CREDENTIALS.first
           password = SpecSupport::RackServer::TestApp::BASIC_AUTH_CREDENTIALS.last
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            phases = [Selenium::WebDriver::BiDi::Network::PHASES[:auth_required]]
-            network.add_intercept(phases: phases)
-            network.on(:auth_required) do |event|
-              request_id = event['request']['request']
-              network.continue_with_auth(request_id, username, password)
-            end
-
-            driver.navigate.to url_for('basicAuth')
-            expect(driver.find_element(tag_name: 'h1').text).to eq('authorized')
+          network = described_class.new(driver.bidi)
+          phases = [Selenium::WebDriver::BiDi::Network::PHASES[:auth_required]]
+          network.add_intercept(phases: phases)
+          network.on(:auth_required) do |event|
+            request_id = event['request']['request']
+            network.continue_with_auth(request_id, username, password)
           end
+
+          driver.navigate.to url_for('basicAuth')
+          expect(driver.find_element(tag_name: 'h1').text).to eq('authorized')
         end
 
         it 'continues without auth' do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            network.add_intercept(phases: [described_class::PHASES[:auth_required]])
-            network.on(:auth_required) do |event|
-              request_id = event['request']['request']
-              network.continue_without_auth(request_id)
-            end
-
-            expect { driver.navigate.to url_for('basicAuth') }.to raise_error(Error::WebDriverError)
+          network = described_class.new(driver.bidi)
+          network.add_intercept(phases: [described_class::PHASES[:auth_required]])
+          network.on(:auth_required) do |event|
+            request_id = event['request']['request']
+            network.continue_without_auth(request_id)
           end
+
+          expect { driver.navigate.to url_for('basicAuth') }.to raise_error(Error::WebDriverError)
         end
 
         it 'cancels auth' do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            network.add_intercept(phases: [described_class::PHASES[:auth_required]])
-            network.on(:auth_required) do |event|
-              request_id = event['request']['request']
-              network.cancel_auth(request_id)
-            end
-
-            driver.navigate.to url_for('basicAuth')
-            expect(driver.find_element(tag_name: 'pre').text).to eq('Login please')
+          network = described_class.new(driver.bidi)
+          network.add_intercept(phases: [described_class::PHASES[:auth_required]])
+          network.on(:auth_required) do |event|
+            request_id = event['request']['request']
+            network.cancel_auth(request_id)
           end
+
+          driver.navigate.to url_for('basicAuth')
+          expect(driver.find_element(tag_name: 'pre').text).to eq('Login please')
         end
 
         it 'continues request' do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            network.add_intercept(phases: [described_class::PHASES[:before_request]])
-            network.on(:before_request) do |event|
-              request_id = event['request']['request']
-              network.continue_request(id: request_id)
-            end
-
-            driver.navigate.to url_for('formPage.html')
-            expect(driver.find_element(name: 'login')).to be_displayed
+          network = described_class.new(driver.bidi)
+          network.add_intercept(phases: [described_class::PHASES[:before_request]])
+          network.on(:before_request) do |event|
+            request_id = event['request']['request']
+            network.continue_request(id: request_id)
           end
+
+          driver.navigate.to url_for('formPage.html')
+          expect(driver.find_element(name: 'login')).to be_displayed
         end
 
         it 'fails request' do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            network.add_intercept(phases: [described_class::PHASES[:before_request]])
-            network.on(:before_request) do |event|
-              request_id = event['request']['request']
-              network.fail_request(request_id)
-            end
-
-            expect { driver.navigate.to url_for('formPage.html') }.to raise_error(Error::WebDriverError)
+          network = described_class.new(driver.bidi)
+          network.add_intercept(phases: [described_class::PHASES[:before_request]])
+          network.on(:before_request) do |event|
+            request_id = event['request']['request']
+            network.fail_request(request_id)
           end
+
+          expect { driver.navigate.to url_for('formPage.html') }.to raise_error(Error::WebDriverError)
         end
 
         it 'continues response' do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            network.add_intercept(phases: [described_class::PHASES[:response_started]])
-            network.on(:response_started) do |event|
-              request_id = event['request']['request']
-              network.continue_response(id: request_id)
-            end
-
-            driver.navigate.to url_for('formPage.html')
-            expect(driver.find_element(name: 'login')).to be_displayed
+          network = described_class.new(driver.bidi)
+          network.add_intercept(phases: [described_class::PHASES[:response_started]])
+          network.on(:response_started) do |event|
+            request_id = event['request']['request']
+            network.continue_response(id: request_id)
           end
+
+          driver.navigate.to url_for('formPage.html')
+          expect(driver.find_element(name: 'login')).to be_displayed
         end
 
         it 'provides response', except: {browser: :firefox,
                                          reason: 'https://github.com/w3c/webdriver-bidi/issues/747'} do
-          reset_driver!(web_socket_url: true) do |driver|
-            network = described_class.new(driver.bidi)
-            network.add_intercept(phases: [described_class::PHASES[:response_started]])
-            network.on(:response_started) do |event|
-              request_id = event['request']['request']
-              network.provide_response(
-                id: request_id,
-                status: 200,
-                headers: [
-                  {
-                    name: 'foo',
-                    value: {
-                      type: 'string',
-                      value: 'bar'
-                    }
+          network = described_class.new(driver.bidi)
+          network.add_intercept(phases: [described_class::PHASES[:response_started]])
+          network.on(:response_started) do |event|
+            request_id = event['request']['request']
+            network.provide_response(
+              id: request_id,
+              status: 200,
+              headers: [
+                {
+                  name: 'foo',
+                  value: {
+                    type: 'string',
+                    value: 'bar'
                   }
-                ],
-                body: {
-                  type: 'string',
-                  value: '<html><head><title>Hello World!</title></head><body/></html>'
                 }
-              )
-            end
-
-            driver.navigate.to url_for('formPage.html')
-            source = driver.page_source
-            expect(source).not_to include('There should be a form here:')
-            expect(source).to include('Hello World!')
+              ],
+              body: {
+                type: 'string',
+                value: '<html><head><title>Hello World!</title></head><body/></html>'
+              }
+            )
           end
+
+          driver.navigate.to url_for('formPage.html')
+          source = driver.page_source
+          expect(source).not_to include('There should be a form here:')
+          expect(source).to include('Hello World!')
         end
 
         it 'sets the cache to bypass' do
-          reset_driver!(web_socket_url: true) do |driver|
-            browsing_context = BrowsingContext.new(driver).create
-            network = described_class.new(driver.bidi)
-            network.set_cache_behavior('bypass', browsing_context)
-            expect(network.set_cache_behavior('bypass', browsing_context)).to be_a(Hash)
-          end
+          browsing_context = BrowsingContext.new(driver).create
+          network = described_class.new(driver.bidi)
+          network.set_cache_behavior('bypass', browsing_context)
+          expect(network.set_cache_behavior('bypass', browsing_context)).to be_a(Hash)
         end
 
         it 'sets the cache to default' do
-          reset_driver!(web_socket_url: true) do |driver|
-            browsing_context = BrowsingContext.new(driver).create
-            network = described_class.new(driver.bidi)
-            expect(network.set_cache_behavior('default', browsing_context)).to be_a(Hash)
-          end
+          browsing_context = BrowsingContext.new(driver).create
+          network = described_class.new(driver.bidi)
+          expect(network.set_cache_behavior('default', browsing_context)).to be_a(Hash)
         end
       end
     end