aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-09-30 09:44:26 -0700
committerJosé Valim <jose.valim@gmail.com>2011-09-30 09:44:26 -0700
commit926e97ca668bbd6d93546f57ce2b253b7d4b6cca (patch)
treeec6dabecd1dfa25bd52694c65289d0dd0f58088e /railties
parentd4457dc32b4d5dc9fde6c852f55a0d43ee021282 (diff)
parent44791a2bc6611b755b418f1db3ca93f9edec0908 (diff)
downloadrails-926e97ca668bbd6d93546f57ce2b253b7d4b6cca.tar.gz
rails-926e97ca668bbd6d93546f57ce2b253b7d4b6cca.tar.bz2
rails-926e97ca668bbd6d93546f57ce2b253b7d4b6cca.zip
Merge pull request #3181 from yahonda/fix_uninitialized_constant_testfixtures
Modified how to handle if ActiveRecord is defined.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/test_help.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 68f566274d..8d0d8cacac 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -24,7 +24,7 @@ if defined?(MiniTest)
end
end
-if defined?(ActiveRecord)
+if defined?(ActiveRecord::Base)
require 'active_record/test_case'
class ActiveSupport::TestCase