From d2a69080f99f84787c70366d35fa7e562a87457c Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 5 Jan 2012 11:10:52 -0800 Subject: [PATCH] do not require a file that is not used --- activerecord/test/cases/helper.rb | 1 + railties/lib/rails/test_help.rb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index 859c3d1947..c05d588a54 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -7,6 +7,7 @@ require 'stringio' require 'mocha' require 'active_record' +require 'active_record/test_case' require 'active_support/dependencies' require 'active_support/logger' diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 8d0d8cacac..1b5ab549be 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -25,8 +25,6 @@ if defined?(MiniTest) end if defined?(ActiveRecord::Base) - require 'active_record/test_case' - class ActiveSupport::TestCase include ActiveRecord::TestFixtures self.fixture_path = "#{Rails.root}/test/fixtures/"