diff options
| author | Ryan Garver <ragarver@gmail.com> | 2012-10-02 10:37:27 -0700 |
|---|---|---|
| committer | Ryan Garver <ragarver@gmail.com> | 2012-10-02 10:37:27 -0700 |
| commit | 4cb50a3f571234b1202f9a0dffe39b445ecf807d (patch) | |
| tree | 13780082c3974bc480cf35722cabf8788beed3ab /actionmailer/test | |
| parent | 3fdb7126110caad3f3db4c2b44ffc365b51c34eb (diff) | |
| parent | df08271f9c044b7614d70baf4b818f1a79f4a6e1 (diff) | |
| download | rails-4cb50a3f571234b1202f9a0dffe39b445ecf807d.tar.gz rails-4cb50a3f571234b1202f9a0dffe39b445ecf807d.tar.bz2 rails-4cb50a3f571234b1202f9a0dffe39b445ecf807d.zip | |
Merge branch 'master' into feature/public-fragment_name_with_digest
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/base_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 4f2af50fdd..17ce8b7072 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -662,6 +662,13 @@ class BaseTest < ActiveSupport::TestCase assert_equal ["robert.pankowecki@gmail.com"], DefaultFromMailer.welcome.from end + test "Mailer.deliver_welcome calls Mailer.welcome.deliver" do + BaseMailer.deliveries.clear + BaseMailer.deliver_welcome(subject: 'omg') + assert_equal 1, BaseMailer.deliveries.length + assert_equal 'omg', BaseMailer.deliveries.first.subject + end + protected # Execute the block setting the given values and restoring old values after |