From dd18bdeca510588f203bc016e25a6e6eafbb29e1 Mon Sep 17 00:00:00 2001 From: Santosh Natarajan Date: Fri, 28 Jul 2017 12:43:01 -0600 Subject: [PATCH] spec: restart driver with saucelabs & set custom timeout Change-Id: Ib7dafd337a4226dc29772dd24f5c2bc13536ad61 Reviewed-on: https://gerrit.instructure.com/120858 Tested-by: Jenkins Reviewed-by: Robert Lamb Product-Review: Robert Lamb QA-Review: Robert Lamb --- spec/selenium/common.rb | 5 +++++ spec/selenium/test_setup/selenium_driver_setup.rb | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/spec/selenium/common.rb b/spec/selenium/common.rb index db107d018d8..bed4476764a 100644 --- a/spec/selenium/common.rb +++ b/spec/selenium/common.rb @@ -188,5 +188,10 @@ shared_context "in-process server selenium tests" do ensure SeleniumDriverSetup.disallow_requests! end + + if SeleniumDriverSetup.reset_driver_between_specs? + driver.quit + SeleniumDriverSetup.reset! + end end end diff --git a/spec/selenium/test_setup/selenium_driver_setup.rb b/spec/selenium/test_setup/selenium_driver_setup.rb index 76e798c19c6..a304683d539 100644 --- a/spec/selenium/test_setup/selenium_driver_setup.rb +++ b/spec/selenium/test_setup/selenium_driver_setup.rb @@ -42,8 +42,8 @@ module SeleniumDriverSetup # nothing should wait by default implicit_wait: 0, # except finding elements - finder: 5, - script: 5 + finder: CONFIG[:finder_timeout_seconds] || 5, + script: CONFIG[:script_timeout_seconds] || 5 }.freeze # If you have some really slow UI, you can temporarily override @@ -91,6 +91,11 @@ module SeleniumDriverSetup @driver = nil end + def reset_driver_between_specs? + SeleniumDriverSetup::CONFIG[:remote_url].present? && + SeleniumDriverSetup::CONFIG[:remote_url].downcase.include?("saucelabs") + end + def run begin [