diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-07 18:32:52 +1100 |
|---|---|---|
| committer | Yehuda Katz <yehudakatz@YK.local> | 2010-02-06 23:36:03 -0800 |
| commit | bb55bbd207836d6d2eb1aa3dff1170f81a60131f (patch) | |
| tree | 1dd8cf7fbb7a1725595841dd905191209df7a721 /actionmailer | |
| parent | a4c32897585dde2b939b269f23ea537393e6fc0b (diff) | |
| download | rails-bb55bbd207836d6d2eb1aa3dff1170f81a60131f.tar.gz rails-bb55bbd207836d6d2eb1aa3dff1170f81a60131f.tar.bz2 rails-bb55bbd207836d6d2eb1aa3dff1170f81a60131f.zip | |
Fixing actionmailer tests for CI
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/base_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 7e794e10e8..222db66aaa 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -461,7 +461,8 @@ class BaseTest < ActiveSupport::TestCase assert_instance_of Mail::Message, mail end - test "calling deliver on the action should increment the deliveries collection" do + test "calling deliver on the action should increment the deliveries collection if using the test mailer" do + BaseMailer.delivery_method = :test BaseMailer.deliveries.clear BaseMailer.welcome.deliver assert_equal(1, BaseMailer.deliveries.length) |