diff options
| -rw-r--r-- | railties/CHANGELOG | 3 | ||||
| -rw-r--r-- | railties/environments/test.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index a7bc95386f..477bde3d1c 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,6 +1,7 @@ *SVN* -* Added ActionMailer::Base.raise_delivery_errors = false to the test environment as we checks will be performed against deliveries array instead. +* Added ActionMailer::Base.deliver_method = :test to the test environment so that mail objects are available in ActionMailer::Base.deliveries + for functional testing. * Added protection for creating a model through the generators with a name of an existing class, like Thread or Date. It'll even offer you a synonym using wordnet.princeton.edu as a look-up. No, I'm not kidding :) [Florian Gross] diff --git a/railties/environments/test.rb b/railties/environments/test.rb index 11ce5066de..c20c260033 100644 --- a/railties/environments/test.rb +++ b/railties/environments/test.rb @@ -1,4 +1,4 @@ ActionController::Base.consider_all_requests_local = true ActionController::Base.reload_dependencies = false ActiveRecord::Base.reload_associations = false -ActionMailer::Base.raise_delivery_errors = false
\ No newline at end of file +ActionMailer::Base.delivery_method = :test
\ No newline at end of file |