aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-01-24 16:56:24 +0000
committerRobin Houston <robin.houston@gmail.com>2012-01-24 16:56:24 +0000
commite6506561b67e35800c71674642223547f0633c52 (patch)
tree6be230228e9ee6d9c2c6d1af35d7497f08a32c0f
parent9bbef0aa8017070d351209d70d79b1611879266f (diff)
A couple more test isolation failures
Towards #361
-rw-r--r--spec/models/request_mailer_spec.rb1
-rw-r--r--spec/models/track_mailer_spec.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb
index ef4ed8074..2888213d7 100644
--- a/spec/models/request_mailer_spec.rb
+++ b/spec/models/request_mailer_spec.rb
@@ -4,6 +4,7 @@ describe RequestMailer, " when receiving incoming mail" do
fixtures :public_bodies, :public_body_translations, :public_body_versions, :users, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things
before(:each) do
load_raw_emails_data(raw_emails)
+ ActionMailer::Base.deliveries = []
end
it "should append it to the appropriate request" do
diff --git a/spec/models/track_mailer_spec.rb b/spec/models/track_mailer_spec.rb
index 67a64ee10..4f5499a90 100644
--- a/spec/models/track_mailer_spec.rb
+++ b/spec/models/track_mailer_spec.rb
@@ -155,6 +155,7 @@ describe TrackMailer do
@post_redirect = mock_model(PostRedirect, :save! => true,
:email_token => "token")
PostRedirect.stub!(:new).and_return(@post_redirect)
+ ActionMailer::Base.deliveries = []
end
it 'should deliver one email, with right headers' do