X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b0348093f8877d2f59f153bf35e87ba411f4004b..d479a3781a1c5437620010c5254039befec30f5c:/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