diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-02-03 13:38:59 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-02-03 13:38:59 +0000 |
| commit | 44bb96d40758f3b8bb9da20e3037ff2f04e81327 (patch) | |
| tree | 2f43c9c02205fec1fb68cdcb66735d5b1ee3172f /spec/lib | |
| parent | 7ed887f0989425d9e412890800df05637b08c025 (diff) | |
| parent | 14b5be69dc2dc3c4dd817feb0b5a8402fc343db4 (diff) | |
Merge branch 'release/0.5'
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/sendmail_return_path_spec.rb | 1 | ||||
| -rw-r--r-- | spec/lib/tmail_extensions_spec.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/spec/lib/sendmail_return_path_spec.rb b/spec/lib/sendmail_return_path_spec.rb index f1a91240b..7708edb35 100644 --- a/spec/lib/sendmail_return_path_spec.rb +++ b/spec/lib/sendmail_return_path_spec.rb @@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "when sending email with an altered return path" do + before(:each) { ActionMailer::Base.deliveries = [] } it "should default to delivery method test" do ActionMailer::Base.delivery_method.should == :test diff --git a/spec/lib/tmail_extensions_spec.rb b/spec/lib/tmail_extensions_spec.rb index 6a55c34da..bd89e6a84 100644 --- a/spec/lib/tmail_extensions_spec.rb +++ b/spec/lib/tmail_extensions_spec.rb @@ -6,6 +6,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "when using TMail" do + before(:each) do + ActionMailer::Base.deliveries.clear + end + it "should load an email with funny MIME settings" do # just send it to the holding pen InfoRequest.holding_pen_request.incoming_messages.size.should == 0 |