aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/environments/test.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index f2fc996990..a7bc95386f 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +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 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 1cfa614de3..11ce5066de 100644
--- a/railties/environments/test.rb
+++ b/railties/environments/test.rb
@@ -1,3 +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