aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-11-11 01:01:11 +0000
committerRick Olson <technoweenie@gmail.com>2007-11-11 01:01:11 +0000
commit49cb41270ae8db886987b8a3762d8e512d646ffa (patch)
tree8c3c7b05b502d31806af0e4f263e67297debde91 /railties
parent79823e0b2fa3b6d34aca1945d25e2f2574635823 (diff)
downloadrails-49cb41270ae8db886987b8a3762d8e512d646ffa.tar.gz
rails-49cb41270ae8db886987b8a3762d8e512d646ffa.tar.bz2
rails-49cb41270ae8db886987b8a3762d8e512d646ffa.zip
Only load ActionMailer::TestCase if ActionMailer is loaded. Closes #10137 [defunkt]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8127 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/test_help.rb2
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