Merge remote-tracking branch 'upstream/pull/4359'

[rails.git] / test / teaspoon_env.rb

diff --git a/test/teaspoon_env.rb b/test/teaspoon_env.rb
index c14045b1c0179b929f556c4c87fa615db71e16a8..a64274c0a6fa5a5c79008af8393c187f73cc1397 100644 (file)
--- a/test/teaspoon_env.rb
+++ b/test/teaspoon_env.rb
@@ -100,7 +100,8 @@ 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(:args => ["-headless"])
+  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,