X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ae00fa84c8f981e909c61ab31b6115bb96e859cc..a5ee93b30110e2c89879e0a67ab2b1c18158faf2:/test/teaspoon_env.rb

diff --git a/test/teaspoon_env.rb b/test/teaspoon_env.rb
index 8a9dc001f..a64274c0a 100644
--- a/test/teaspoon_env.rb
+++ b/test/teaspoon_env.rb
@@ -100,10 +100,13 @@ Teaspoon.configure do |config|
   # Capybara Webkit: https://github.com/jejacks0n/teaspoon/wiki/Using-Capybara-Webkit
   require "selenium-webdriver"
   config.driver = :selenium
+  firefox_options = Selenium::WebDriver::Firefox::Options.new
+  firefox_options.args = ["-headless"] if Settings.system_test_headless
+  firefox_options.binary = Settings.system_test_firefox_binary if Settings.system_test_firefox_binary
   config.driver_options = {
     :client_driver => :firefox,
     :selenium_options => {
-      :options => Selenium::WebDriver::Firefox::Options.new(:args => ["-headless"])
+      :options => firefox_options
     }
   }