Merge pull request #5691 from tomhughes/system-test-clear-deliveries

Clear test deliveries before and after system tests

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index f2fcadfd7c582efedfdcd60df7ee0947b896db4b..f7769426c562fc1a8ebb80fa708478f1fc2022ba 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -7,6 +7,8 @@ ActiveSupport.on_load(:action_dispatch_system_test_case) do
 end
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  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