Merge commit 'origin/master' into savepoints

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 6ba7597f56..ed2915b023 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -641,15 +641,15 @@ end
 class FixtureLoadingTest < ActiveRecord::TestCase
   uses_mocha 'reloading_fixtures_through_accessor_methods' do
     def test_logs_message_for_failed_dependency_load
-      Test::Unit::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError)
+      ActiveRecord::TestCase.expects(:require_dependency).with(:does_not_exist).raises(LoadError)
       ActiveRecord::Base.logger.expects(:warn)
-      Test::Unit::TestCase.try_to_load_dependency(:does_not_exist)
+      ActiveRecord::TestCase.try_to_load_dependency(:does_not_exist)
     end
 
     def test_does_not_logs_message_for_successful_dependency_load
-      Test::Unit::TestCase.expects(:require_dependency).with(:works_out_fine)
+      ActiveRecord::TestCase.expects(:require_dependency).with(:works_out_fine)
       ActiveRecord::Base.logger.expects(:warn).never
-      Test::Unit::TestCase.try_to_load_dependency(:works_out_fine)
+      ActiveRecord::TestCase.try_to_load_dependency(:works_out_fine)
     end
   end
 end