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

[rails.git] / test / controllers / messages_controller_test.rb

diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
index bdf88600cb9f75bae864dc1ea9fe4b2bd5938b50..5168128ffbd0e86406429afad4aaf116fce366f5 100644 (file)
--- a/test/controllers/messages_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -167,7 +167,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
     assert_match(/Test message body/, e.text_part.decoded)
     assert_match(/Test message body/, e.html_part.decoded)
     assert_match %r{#{Settings.server_url}/messages/[0-9]+}, e.text_part.decoded
-    ActionMailer::Base.deliveries.clear
+
     m = Message.last
     assert_equal user.id, m.from_user_id
     assert_equal recipient_user.id, m.to_user_id