Add option to override Firefox binary used in system tests

diff --git a/config/settings/test.yml b/config/settings/test.yml
index b0e2f461392cce37eb7221ad9f72e0601f7a361c..b7cffcc27b33df6ef361155d832cbc265a1f30a2 100644 (file)
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -53,3 +53,5 @@ doorkeeper_signing_key: |
   cK1+/2V+OkM/0nXjxPwPj7LiOediUyZNUn48r29uGOL1S83PSUdyST207CP6mZjc
   K8aJmnGsVEAcWPzbpNh14q/c
   -----END PRIVATE KEY-----
   cK1+/2V+OkM/0nXjxPwPj7LiOediUyZNUn48r29uGOL1S83PSUdyST207CP6mZjc
   K8aJmnGsVEAcWPzbpNh14q/c
   -----END PRIVATE KEY-----

+# Override Firefox binary used in system tests
+#system_test_firefox_binary:

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 0ddb8a87ad73f91606df90af224df851c9919c06..496f37c16be4be820d16dfb753ab1bed77c8cd2a 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -9,6 +9,7 @@ end
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :selenium, :using => :headless_firefox do |options|
     options.add_preference("intl.accept_languages", "en")
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :selenium, :using => :headless_firefox do |options|
     options.add_preference("intl.accept_languages", "en")

+    options.binary = Settings.system_test_firefox_binary if Settings.system_test_firefox_binary

   end
 
   def before_setup
   end
 
   def before_setup

diff --git a/test/teaspoon_env.rb b/test/teaspoon_env.rb
index 8a9dc001f3150b43cb9c671a724ffec855779198..c14045b1c0179b929f556c4c87fa615db71e16a8 100644 (file)
--- a/test/teaspoon_env.rb
+++ b/test/teaspoon_env.rb
@@ -100,10 +100,12 @@ Teaspoon.configure do |config|
   # Capybara Webkit: https://github.com/jejacks0n/teaspoon/wiki/Using-Capybara-Webkit
   require "selenium-webdriver"
   config.driver = :selenium
   # Capybara Webkit: https://github.com/jejacks0n/teaspoon/wiki/Using-Capybara-Webkit
   require "selenium-webdriver"
   config.driver = :selenium

+  firefox_options = Selenium::WebDriver::Firefox::Options.new(:args => ["-headless"])
+  firefox_options.binary = Settings.system_test_firefox_binary if Settings.system_test_firefox_binary

   config.driver_options = {
     :client_driver => :firefox,
     :selenium_options => {
   config.driver_options = {
     :client_driver => :firefox,
     :selenium_options => {

-      :options => Selenium::WebDriver::Firefox::Options.new(:args => ["-headless"])
+      :options => firefox_options

     }
   }
 
     }
   }