Move selenium driver version logging into helper method

This commit is contained in:
Thomas Walpole 2019-04-19 12:22:17 -07:00
parent 50981157c8
commit 9c90f4dcdb
6 changed files with 12 additions and 26 deletions

View File

@ -4,7 +4,6 @@ require 'spec_helper'
require 'selenium-webdriver'
require 'shared_selenium_session'
require 'rspec/shared_spec_matchers'
require 'webdrivers'
CHROME_DRIVER = :selenium_chrome
@ -34,11 +33,7 @@ end
skipped_tests = %i[response_headers status_code trigger]
if ENV['CI']
service = Selenium::WebDriver::Chrome
service = service::Service if Selenium::WebDriver::Service.respond_to? :driver_path
$stdout.puts `#{service.driver_path} --version`
end
Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Chrome) if ENV['CI']
Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests do |example|
case example.metadata[:full_description]

View File

@ -16,11 +16,7 @@ end
skipped_tests = %i[response_headers status_code trigger modals]
if ENV['CI']
service = Selenium::WebDriver::Edge
service = service::Service if Selenium::WebDriver::Service.respond_to? :driver_path
$stdout.puts `#{service.driver_path} --version`
end
Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Edge) if ENV['CI']
Capybara::SpecHelper.run_specs TestSessions::SeleniumEdge, 'selenium', capybara_skip: skipped_tests do |example|
case example.metadata[:description]

View File

@ -43,11 +43,7 @@ end
skipped_tests = %i[response_headers status_code trigger]
if ENV['CI']
service = Selenium::WebDriver::Firefox
service = service::Service if Selenium::WebDriver::Service.respond_to? :driver_path
$stdout.puts `#{service.driver_path} --version`
end
Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Firefox) if ENV['CI']
Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capybara_skip: skipped_tests do |example|
case example.metadata[:full_description]

View File

@ -64,11 +64,7 @@ TestSessions::SeleniumIE.current_window.resize_to(800, 500)
skipped_tests = %i[response_headers status_code trigger modals hover form_attribute windows]
if ENV['CI']
service = Selenium::WebDriver::IE
service = service::Service if Selenium::WebDriver::Service.respond_to? :driver_path
$stdout.puts `#{service.driver_path} --version`
end
Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::IE) if ENV['CI']
TestSessions::SeleniumIE.current_window.resize_to(1600, 1200)

View File

@ -37,11 +37,7 @@ end
skipped_tests = %i[response_headers status_code trigger windows drag]
if ENV['CI']
service = Selenium::WebDriver::Safari
service = service::Service if Selenium::WebDriver::Service.respond_to? :driver_path
$stdout.puts `#{service.driver_path} --version`
end
Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Safari) if ENV['CI']
Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybara_skip: skipped_tests do |example|
case example.metadata[:full_description]

View File

@ -52,6 +52,13 @@ module Capybara
def remote?(session)
session.driver.browser.is_a? ::Selenium::WebDriver::Remote::Driver
end
def self.log_selenium_driver_version(mod)
mod = mod::Service if ::Selenium::WebDriver::Service.respond_to? :driver_path
path = mod.driver_path
path = path.call if path.respond_to? :call
$stdout.puts `#{path} --version`
end
end
end