From dbdc7ae4aaf1cedf49dbe10cde719d413de38d5a Mon Sep 17 00:00:00 2001 From: wvengen Date: Wed, 14 Jan 2015 20:57:43 +0100 Subject: [PATCH] Workaround occasional mailer test failure --- spec/integration/login_spec.rb | 2 +- spec/spec_helper.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/integration/login_spec.rb b/spec/integration/login_spec.rb index f20325d2..f0441354 100644 --- a/spec/integration/login_spec.rb +++ b/spec/integration/login_spec.rb @@ -12,7 +12,7 @@ describe LoginController, :type => :feature do it 'sends a reset email' do post reset_password_path, user: {email: user.email} email = ActionMailer::Base.deliveries.first - expect((email.to rescue [])).to eq [user.email] + expect(email.to).to eq [user.email] end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 053282ec..433d6c51 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -32,6 +32,8 @@ RSpec.configure do |config| DatabaseCleaner.start # maximise window so that buttons can be found on popups RSpec.current_example.metadata[:js] and page.driver.browser.manage.window.maximize + # clean slate mail queues, not sure why needed - https://github.com/rspec/rspec-rails/issues/661 + ActionMailer::Base.deliveries.clear end config.after(:each) do DatabaseCleaner.clean