X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4635fcf04a2d56160519cc5c20c578ec30d6dbcd..3cfb8b7d053edfba454dbcb1eff09382b5dca193:/test/application_system_test_case.rb

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 852f270b6..f7769426c 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -7,7 +7,9 @@ ActiveSupport.on_load(:action_dispatch_system_test_case) do
 end
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
-  driven_by :selenium, :using => :headless_firefox do |options|
+  include ActionMailer::TestCase::ClearTestDeliveries
+
+  driven_by :selenium, :using => Settings.system_test_headless ? :headless_firefox : :firefox do |options|
     options.add_preference("intl.accept_languages", "en")
     options.binary = Settings.system_test_firefox_binary if Settings.system_test_firefox_binary
   end