[rb] improve logic for tests that require specific options

Author: titusfortner

rb/spec/integration/selenium/webdriver/bidi_spec.rb

@@ -21,11 +21,13 @@
 
 module Selenium
  module WebDriver
- describe BiDi, exclusive: {browser: %i[chrome_beta firefox]} do
+ describe BiDi, exclusive: {browser: %i[chrome firefox]} do
  it 'gets session status' do
- status = driver.bidi.session.status
- expect(status).to respond_to(:ready)
- expect(status.message).not_to be_empty
+ reset_driver!(web_socket_url: true) do |driver|
+ status = driver.bidi.session.status
+ expect(status).to respond_to(:ready)
+ expect(status.message).not_to be_empty
+ end
  end
  end
  end

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

@@ -54,52 +54,48 @@ module Chrome
  end
 
  describe 'PrintsPage' do
+ before(:all) { reset_driver!(args: ['--headless']) }
+
+ after(:all) { reset_driver! }
+
  let(:magic_number) { 'JVBER' }
- let(:options) { Chrome::Options.new(args: ['--headless']) }
 
  it 'should return base64 for print command' do
- create_driver!(options: options) do |driver|
- driver.navigate.to url_for('printPage.html')
- expect(driver.print_page).to include(magic_number)
- end
+ driver.navigate.to url_for('printPage.html')
+ expect(driver.print_page).to include(magic_number)
  end
 
  it 'should print with valid params' do
- create_driver!(options: options) do |driver|
- driver.navigate.to url_for('printPage.html')
- expect(driver.print_page(orientation: 'landscape',
- page_ranges: ['1-2'],
- page: {width: 30})).to include(magic_number)
- end
+ driver.navigate.to url_for('printPage.html')
+ expect(driver.print_page(orientation: 'landscape',
+ page_ranges: ['1-2'],
+ page: {width: 30})).to include(magic_number)
  end
 
  it 'should save pdf' do
- create_driver!(options: options) do |driver|
- driver.navigate.to url_for('printPage.html')
+ driver.navigate.to url_for('printPage.html')
 
-  path = "#{Dir.tmpdir}/test#{SecureRandom.urlsafe_base64}.pdf"
+ path = "#{Dir.tmpdir}/test#{SecureRandom.urlsafe_base64}.pdf"
 
-  driver.save_print_page path
+ driver.save_print_page path
 
- expect(File.exist?(path)).to be true
- expect(File.size(path)).to be_positive
- ensure
- FileUtils.rm_rf(path)
- end
+ expect(File.exist?(path)).to be true
+ expect(File.size(path)).to be_positive
+ ensure
+ FileUtils.rm_rf(path)
  end
  end
 
  describe '#logs' do
- before do
- quit_driver
- options = Options.new(logging_prefs: {browser: 'ALL',
- driver: 'ALL',
- performance: 'ALL'})
- create_driver!(options: options)
- driver.navigate.to url_for('errors.html')
+ before(:all) do
+ reset_driver!(logging_prefs: {browser: 'ALL',
+ driver: 'ALL',
+ performance: 'ALL'})
  end
 
- after(:all) { quit_driver }
+ before { driver.navigate.to url_for('errors.html') }
+
+ after(:all) { reset_driver! }
 
  it 'can fetch available log types' do
  expect(driver.logs.available_types).to include(:performance, :browser, :driver)

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

@@ -23,45 +23,26 @@ module Selenium
  module WebDriver
  module Chrome
  describe Options, exclusive: {browser: :chrome} do
- subject(:options) { Options.new }
-
- before { quit_driver }
-
  it 'passes emulated device correctly' do
- options.add_emulation(device_name: 'Nexus 5')
-
- create_driver!(options: options) do |driver|
+ reset_driver!(emulation: {device_name: 'Nexus 5'}) do |driver|
  ua = driver.execute_script 'return window.navigator.userAgent'
  expect(ua).to include('Nexus 5')
  end
  end
 
  it 'passes emulated user agent correctly' do
- options.add_emulation(user_agent: 'foo;bar')
-
- create_driver!(options: options) do |driver|
+ reset_driver!(emulation: {user_agent: 'foo;bar'}) do |driver|
  ua = driver.execute_script 'return window.navigator.userAgent'
  expect(ua).to eq('foo;bar')
  end
  end
 
  it 'passes args correctly' do
- options.add_argument('--user-agent=foo;bar')
-
- create_driver!(options: options) do |driver|
+ reset_driver!(args: ['--user-agent=foo;bar']) do |driver|
  ua = driver.execute_script 'return window.navigator.userAgent'
  expect(ua).to eq('foo;bar')
  end
  end
-
- it 'should be able to run in headless mode with #headless!' do
- options.headless!
-
- create_driver!(options: options) do |driver|
- ua = driver.execute_script 'return window.navigator.userAgent'
- expect(ua).to match(/HeadlessChrome/)
- end
- end
  end
  end # Chrome
  end # WebDriver

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

@@ -66,16 +66,15 @@ module Edge
  end
 
  describe '#logs' do
- before do
- quit_driver
- options = Options.new(logging_prefs: {browser: 'ALL',
- driver: 'ALL',
- performance: 'ALL'})
- create_driver!(options: options)
- driver.navigate.to url_for('errors.html')
+ before(:all) do
+ reset_driver!(logging_prefs: {browser: 'ALL',
+ driver: 'ALL',
+ performance: 'ALL'})
  end
 
- after(:all) { quit_driver }
+ before { driver.navigate.to url_for('errors.html') }
+
+ after(:all) { reset_driver! }
 
  it 'can fetch available log types' do
  expect(driver.logs.available_types).to include(:performance, :browser, :driver)

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

@@ -23,43 +23,26 @@ module Selenium
  module WebDriver
  module Edge
  describe Options, exclusive: {browser: :edge} do
- subject(:options) { Options.new }
-
  it 'passes emulated device correctly' do
- options.add_emulation(device_name: 'Nexus 5')
-
- create_driver!(options: options) do |driver|
+ reset_driver!(emulation: {device_name: 'Nexus 5'}) do |driver|
  ua = driver.execute_script 'return window.navigator.userAgent'
  expect(ua).to include('Nexus 5')
  end
  end
 
  it 'passes emulated user agent correctly' do
- options.add_emulation(user_agent: 'foo;bar')
-
- create_driver!(options: options) do |driver|
+ reset_driver!(emulation: {user_agent: 'foo;bar'}) do |driver|
  ua = driver.execute_script 'return window.navigator.userAgent'
  expect(ua).to eq('foo;bar')
  end
  end
 
  it 'passes args correctly' do
- options.add_argument('--user-agent=foo;bar')
-
- create_driver!(options: options) do |driver|
+ reset_driver!(args: ['--user-agent=foo;bar']) do |driver|
  ua = driver.execute_script 'return window.navigator.userAgent'
  expect(ua).to eq('foo;bar')
  end
  end
-
- it 'should be able to run in headless mode with #headless!' do
- options.headless!
-
- create_driver!(options: options) do |driver|
- ua = driver.execute_script 'return window.navigator.userAgent'
- expect(ua).to match(/HeadlessChrome/)
- end
- end
  end
  end # Edge
  end # WebDriver

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

@@ -25,7 +25,7 @@ module WebDriver
  it 'should click' do
  driver.navigate.to url_for('formPage.html')
  expect { driver.find_element(id: 'imageButton').click }.not_to raise_error
- reset_driver!(1) if %i[safari safari_preview].include? GlobalTestEnv.browser
+ reset_driver!(time: 1) if %i[safari safari_preview].include? GlobalTestEnv.browser
  end
 
  # Safari returns "click intercepted" error instead of "element click intercepted"

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

@@ -140,8 +140,7 @@ module Firefox
  end
 
  it 'can get and set context' do
- options = Options.new(prefs: {'browser.download.dir': 'foo/bar'})
- create_driver!(options: options) do |driver|
+ reset_driver!(prefs: {'browser.download.dir': 'foo/bar'}) do |driver|
  expect(driver.context).to eq 'content'
 
  driver.context = 'chrome'

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

@@ -25,30 +25,21 @@ module Firefox
  describe Profile, exclusive: {browser: :firefox} do
  let(:profile) { Profile.new }
 
- def read_generated_prefs(from = nil)
- prof = from || profile
- dir = prof.layout_on_disk
-
- File.read(File.join(dir, 'user.js'))
- end
-
  before do
- quit_driver
- sleep 2
  profile['browser.startup.homepage'] = url_for('simpleTest.html')
  profile['browser.startup.page'] = 1
  end
 
  it 'should instantiate the browser with the correct profile' do
- create_driver!(options: Options.new(profile: profile)) do |driver|
+ reset_driver!(profile: profile) do |driver|
  expect { wait(5).until { driver.find_element(id: 'oneline') } }.not_to raise_error
  end
  end
 
  it 'should be able to use the same profile more than once' do
- create_driver!(options: Options.new(profile: profile)) do |driver1|
+ reset_driver!(profile: profile) do |driver1|
  expect { wait(5).until { driver1.find_element(id: 'oneline') } }.not_to raise_error
- create_driver!(options: Options.new(profile: profile)) do |driver2|
+ reset_driver!(profile: profile) do |driver2|
  expect { wait(5).until { driver2.find_element(id: 'oneline') } }.not_to raise_error
  end
  end

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

@@ -25,8 +25,8 @@ def driver
  GlobalTestEnv.driver_instance
  end
 
- def reset_driver!(time = 0)
- GlobalTestEnv.reset_driver!(time)
+ def reset_driver!(**opts)
+ GlobalTestEnv.reset_driver!(**opts)
  end
 
  def quit_driver