aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/base_test.rb
diff options
context:
space:
mode:
authorJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-24 12:30:13 +1100
committerJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-24 12:30:13 +1100
commitafc758297c553de467b0c434330cb703d62795f1 (patch)
treed81ab5f36a62449eb6eb4c70c2f6ecf3d63c2759 /actionmailer/test/base_test.rb
parent258ca148004eaa63740ab2186338b3ac872b8187 (diff)
downloadrails-afc758297c553de467b0c434330cb703d62795f1.tar.gz
rails-afc758297c553de467b0c434330cb703d62795f1.tar.bz2
rails-afc758297c553de467b0c434330cb703d62795f1.zip
Moving AS::Notifications call to one location in base
Diffstat (limited to 'actionmailer/test/base_test.rb')
-rw-r--r--actionmailer/test/base_test.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 43a9fb29bb..0b650e9a28 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -325,15 +325,12 @@ class BaseTest < ActiveSupport::TestCase
end
test "ActionMailer should be told when Mail gets delivered" do
+ BaseMailer.deliveries.clear
BaseMailer.expects(:delivered_email).once
email = BaseMailer.deliver_welcome
+ assert_equal(1, BaseMailer.deliveries.length)
end
- # test "ActionMailer should be told when Mail gets delivered using new API" do
- # BaseMailer.expects(:delivered_email).once
- # email = BaseMailer.welcome.deliver
- # end
-
protected
# Execute the block setting the given values and restoring old values after