diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-26 01:03:35 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-26 01:03:35 +0000 |
| commit | 673b5cc3939e9abc3bc1f5984f2a61ed45b70529 (patch) | |
| tree | 5b02800891270972a8946518f37fb807f2b9b7d8 /spec/lib | |
| parent | 0e546a79b205124d7b95b89e4a2e9cc520a4fc10 (diff) | |
| parent | 6d7bea575ec185379efb648f6bbbd520029e3a91 (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/sendmail_return_path_spec.rb | 1 |
1 files changed, 1 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 |