diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/test_help.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 74cb10c8d2..c3817d3d63 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Only load ActionMailer::TestCase if ActionMailer is loaded. Closes #10137 [defunkt] + * Fixed that db:reset would use migrations instead of loading db/schema.rb [DHH] * Ensure the plugin loader only loads plugins once. Closes #10102 [haruki_zaemon] diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb index 48305a57cf..3b91438c08 100644 --- a/railties/lib/test_help.rb +++ b/railties/lib/test_help.rb @@ -10,7 +10,7 @@ require 'active_record/fixtures' require 'action_controller/test_case' require 'action_controller/test_process' require 'action_controller/integration' -require 'action_mailer/test_case' +require 'action_mailer/test_case' if defined?(ActionMailer) Test::Unit::TestCase.fixture_path = RAILS_ROOT + "/test/fixtures/" ActionController::IntegrationTest.fixture_path = Test::Unit::TestCase.fixture_path |