aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/method_scoping_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-01-21 17:20:51 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-01-21 17:20:51 +0000
commit39814fcce0b429eb06654600e4669f1405ffa7d9 (patch)
treebc5cbe7888b3c31b1e2a92f246512218014fdf76 /activerecord/test/cases/method_scoping_test.rb
parent1d4f4cdfe22cbe4962ae8953c96bc5c70d8d4e6a (diff)
downloadrails-39814fcce0b429eb06654600e4669f1405ffa7d9.tar.gz
rails-39814fcce0b429eb06654600e4669f1405ffa7d9.tar.bz2
rails-39814fcce0b429eb06654600e4669f1405ffa7d9.zip
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
Diffstat (limited to 'activerecord/test/cases/method_scoping_test.rb')
-rw-r--r--activerecord/test/cases/method_scoping_test.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/test/cases/method_scoping_test.rb b/activerecord/test/cases/method_scoping_test.rb
index e8e053a311..478050f207 100644
--- a/activerecord/test/cases/method_scoping_test.rb
+++ b/activerecord/test/cases/method_scoping_test.rb
@@ -1,11 +1,11 @@
-require 'abstract_unit'
+require "cases/helper"
require 'models/developer'
require 'models/project'
require 'models/comment'
require 'models/post'
require 'models/category'
-class MethodScopingTest < ActiveSupport::TestCase
+class MethodScopingTest < ActiveRecord::TestCase
fixtures :developers, :projects, :comments, :posts
def test_set_conditions
@@ -125,7 +125,7 @@ class MethodScopingTest < ActiveSupport::TestCase
end
end
-class NestedScopingTest < ActiveSupport::TestCase
+class NestedScopingTest < ActiveRecord::TestCase
fixtures :developers, :projects, :comments, :posts
def test_merge_options
@@ -313,7 +313,7 @@ class NestedScopingTest < ActiveSupport::TestCase
end
end
-class HasManyScopingTest< ActiveSupport::TestCase
+class HasManyScopingTest< ActiveRecord::TestCase
fixtures :comments, :posts
def setup
@@ -343,7 +343,7 @@ class HasManyScopingTest< ActiveSupport::TestCase
end
-class HasAndBelongsToManyScopingTest< ActiveSupport::TestCase
+class HasAndBelongsToManyScopingTest< ActiveRecord::TestCase
fixtures :posts, :categories, :categories_posts
def setup
@@ -373,7 +373,7 @@ end
# We disabled the scoping for has_one and belongs_to as we can't think of a proper use case
-class BelongsToScopingTest< ActiveSupport::TestCase
+class BelongsToScopingTest< ActiveRecord::TestCase
fixtures :comments, :posts
def setup
@@ -393,7 +393,7 @@ class BelongsToScopingTest< ActiveSupport::TestCase
end
-class HasOneScopingTest< ActiveSupport::TestCase
+class HasOneScopingTest< ActiveRecord::TestCase
fixtures :comments, :posts
def setup