github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-30 00:38:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only load ActionMailer::TestCase if ActionMailer is loaded. Closes #10137 [defunkt]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8127 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Rick Olson
2007-11-11 01:01:11 +00:00
parent 79823e0b2f
commit 49cb41270a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
railties/CHANGELOG
View File

@@ -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]

2
railties/lib/test_help.rb
View File

@@ -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