Merge branch 'add-test-mailbox-clear' into 4-0-maintenance

Merge #2293

Changelog.md

@@ -18,6 +18,7 @@ Bug Fixes:
   (Jonathan Rochkind, #2242)
 * `rails generate generator` command now creates related spec file (Joel Azemar, #2217)
 * Relax upper `capybara` version constraint to allow for Capybara 3.x (Phil Pirozhkov, #2281)
+* Clear ActionMailer test mailbox after each example (Benoit Tigeot, #2293)
 
 ### 4.0.0.beta4
 [Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0.beta3...v4.0.0.beta4)

lib/rspec/rails/configuration.rb

@@ -137,6 +137,7 @@ def filter_rails_from_backtrace!
 
       if RSpec::Rails::FeatureCheck.has_action_mailer?
         config.include RSpec::Rails::MailerExampleGroup, type: :mailer
+        config.after { ActionMailer::Base.deliveries.clear }
       end
 
       if RSpec::Rails::FeatureCheck.has_active_job?

spec/rspec/rails/configuration_spec.rb

@@ -256,6 +256,34 @@ def self.application; end
       expect(group.mailer_class).to be(a_mailer_class)
       expect(group.new).to be_a(RSpec::Rails::MailerExampleGroup)
     end
+
+    describe 'clears ActionMailer::Base::Deliveries after each example' do
+      let(:mailer) do
+        Class.new(ActionMailer::Base) do
+          default from: 'from@example.com'
+
+          def welcome(to:)
+            mail(to: to, subject: 'subject', body: render(inline: "Hello", layout: false))
+          end
+        end
+      end
+
+      before do
+        ActionMailer::Base.delivery_method = :test
+      end
+
+      it 'only has deliveries from this test (e.g. from email@example.com)' do
+        mailer.welcome(to: 'email@example.com').deliver_now
+
+        expect(ActionMailer::Base.deliveries.map(&:to).flatten.sort).to eq(['email@example.com'])
+      end
+
+      it 'only has deliveries from this test (e.g. from email_2@example.com)' do
+        mailer.welcome(to: 'email_2@example.com').deliver_now
+
+        expect(ActionMailer::Base.deliveries.map(&:to).flatten.sort).to eq(['email_2@example.com'])
+      end
+    end
   end
 
   it "has a default #file_fixture_path of 'spec/fixtures/files'" do