diff options
| author | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-25 13:46:44 +1100 |
|---|---|---|
| committer | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-25 13:46:44 +1100 |
| commit | 4240369a4399b944a0652807c545ffe99d7fb0cd (patch) | |
| tree | 63614b8e2e3da22a9f1be4a2825d7511d15c7c3e /actionmailer | |
| parent | e4a989e9d99b9860859ad14b5a6fca62a4009cf9 (diff) | |
| download | rails-4240369a4399b944a0652807c545ffe99d7fb0cd.tar.gz rails-4240369a4399b944a0652807c545ffe99d7fb0cd.tar.bz2 rails-4240369a4399b944a0652807c545ffe99d7fb0cd.zip | |
changed test to get TestMailer to use :file delivery method directly (as setup action was resetting delivery_method to :test on init
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/old_base/mail_service_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb index 20b0f30b84..2e33abf9d6 100644 --- a/actionmailer/test/old_base/mail_service_test.rb +++ b/actionmailer/test/old_base/mail_service_test.rb @@ -967,10 +967,10 @@ EOF end def test_file_delivery_should_create_a_file - ActionMailer::Base.delivery_method = :file - tmp_location = ActionMailer::Base.file_settings[:location] + TestMailer.delivery_method = :file + tmp_location = TestMailer.file_settings[:location] - TestMailer.cc_bcc(@recipient).deliver + result = TestMailer.cc_bcc(@recipient).deliver assert File.exists?(tmp_location) assert File.directory?(tmp_location) assert File.exists?(File.join(tmp_location, @recipient)) |