Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

7 files changed, 15 insertions, 15 deletions

diff --git a/activerecord/test/cases/associations/callbacks_test.rb b/activerecord/test/cases/associations/callbacks_test.rb
index 0b510df8d9..17188e0b79 100644
--- a/activerecord/test/cases/associations/callbacks_test.rb
+++ b/activerecord/test/cases/associations/callbacks_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/author'
@@ -6,7 +6,7 @@ require 'models/category'
 require 'models/project'
 require 'models/developer'
 
-class AssociationCallbacksTest < ActiveSupport::TestCase
+class AssociationCallbacksTest < ActiveRecord::TestCase
   fixtures :posts, :authors, :projects, :developers
 
   def setup
diff --git a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
index 0ca0b21084..6349a3a8b2 100644
--- a/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
+++ b/activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/author'
@@ -8,7 +8,7 @@ require 'models/company'
 require 'models/topic'
 require 'models/reply'
 
-class CascadedEagerLoadingTest < ActiveSupport::TestCase
+class CascadedEagerLoadingTest < ActiveRecord::TestCase
   fixtures :authors, :mixins, :companies, :posts, :topics
 
   def test_eager_association_loading_with_cascaded_two_levels
@@ -95,7 +95,7 @@ end
 
 require 'models/vertex'
 require 'models/edge'
-class CascadedEagerLoadingTest < ActiveSupport::TestCase
+class CascadedEagerLoadingTest < ActiveRecord::TestCase
   fixtures :edges, :vertices
 
   def test_eager_association_loading_with_recursive_cascading_four_levels_has_many_through
diff --git a/activerecord/test/cases/associations/eager_singularization_test.rb b/activerecord/test/cases/associations/eager_singularization_test.rb
index c1d89a2484..07d0b24613 100644
--- a/activerecord/test/cases/associations/eager_singularization_test.rb
+++ b/activerecord/test/cases/associations/eager_singularization_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 
 class Virus < ActiveRecord::Base
   belongs_to :octopus
@@ -39,7 +39,7 @@ class Compress < ActiveRecord::Base
 end
 
 
-class EagerSingularizationTest < ActiveSupport::TestCase
+class EagerSingularizationTest < ActiveRecord::TestCase
 
   def setup
     if ActiveRecord::Base.connection.supports_migrations?
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 9ceb507e91..9c258b574f 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/tagging'
 require 'models/comment'
@@ -8,7 +8,7 @@ require 'models/company'
 require 'models/person'
 require 'models/reader'
 
-class EagerAssociationTest < ActiveSupport::TestCase
+class EagerAssociationTest < ActiveRecord::TestCase
   fixtures :posts, :comments, :authors, :categories, :categories_posts,
             :companies, :accounts, :tags, :taggings, :people, :readers
 
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb
index a34f1bf2bf..5c01c3c1f5 100644
--- a/activerecord/test/cases/associations/extension_test.rb
+++ b/activerecord/test/cases/associations/extension_test.rb
@@ -1,10 +1,10 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/project'
 require 'models/developer'
 
-class AssociationsExtensionsTest < ActiveSupport::TestCase
+class AssociationsExtensionsTest < ActiveRecord::TestCase
   fixtures :projects, :developers, :developers_projects, :comments, :posts
 
   def test_extension_on_has_many
diff --git a/activerecord/test/cases/associations/inner_join_association_test.rb b/activerecord/test/cases/associations/inner_join_association_test.rb
index 3f3cc4f167..f87c914125 100644
--- a/activerecord/test/cases/associations/inner_join_association_test.rb
+++ b/activerecord/test/cases/associations/inner_join_association_test.rb
@@ -1,11 +1,11 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/post'
 require 'models/comment'
 require 'models/author'
 require 'models/category'
 require 'models/categorization'
 
-class InnerJoinAssociationTest < ActiveSupport::TestCase
+class InnerJoinAssociationTest < ActiveRecord::TestCase
   fixtures :authors, :posts, :comments, :categories, :categories_posts, :categorizations
 
   def test_construct_finder_sql_creates_inner_joins
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index c8ae42d78c..f59fe70654 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "cases/helper"
 require 'models/tag'
 require 'models/tagging'
 require 'models/post'
@@ -12,7 +12,7 @@ require 'models/edge'
 require 'models/book'
 require 'models/citation'
 
-class AssociationsJoinModelTest < ActiveSupport::TestCase
+class AssociationsJoinModelTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
   fixtures :posts, :authors, :categories, :categorizations, :comments, :tags, :taggings, :author_favorites, :vertices, :items, :books