aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/fixtures/categories/special_categories.yml9
-rw-r--r--activerecord/test/fixtures/categories/subsubdir/arbitrary_filename.yml4
-rw-r--r--activerecord/test/method_scoping_test.rb2
3 files changed, 14 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/categories/special_categories.yml b/activerecord/test/fixtures/categories/special_categories.yml
new file mode 100644
index 0000000000..517fc8f7ad
--- /dev/null
+++ b/activerecord/test/fixtures/categories/special_categories.yml
@@ -0,0 +1,9 @@
+sub_special_1:
+ id: 100
+ name: A special category in a subdir file
+ type: SpecialCategory
+
+sub_special_2:
+ id: 101
+ name: Another special category
+ type: SpecialCategory
diff --git a/activerecord/test/fixtures/categories/subsubdir/arbitrary_filename.yml b/activerecord/test/fixtures/categories/subsubdir/arbitrary_filename.yml
new file mode 100644
index 0000000000..389a04a5aa
--- /dev/null
+++ b/activerecord/test/fixtures/categories/subsubdir/arbitrary_filename.yml
@@ -0,0 +1,4 @@
+sub_special_3:
+ id: 102
+ name: A special category in an arbitrarily named subsubdir file
+ type: SpecialCategory
diff --git a/activerecord/test/method_scoping_test.rb b/activerecord/test/method_scoping_test.rb
index d95fc1dcc8..551d7c1dd3 100644
--- a/activerecord/test/method_scoping_test.rb
+++ b/activerecord/test/method_scoping_test.rb
@@ -295,7 +295,7 @@ class HasAndBelongsToManyScopingTest< Test::Unit::TestCase
end
def test_forwarding_to_dynamic_finders
- assert_equal 6, Category.find_all_by_type('SpecialCategory').size
+ assert_equal 4, Category.find_all_by_type('SpecialCategory').size
assert_equal 0, @welcome.categories.find_all_by_type('SpecialCategory').size
assert_equal 2, @welcome.categories.find_all_by_type('Category').size
end