From 56b4fdb52bd327d42aec9ee3dcea01298aafe945 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sat, 6 Apr 2019 11:37:34 +0900 Subject: Association loading isn't to be affected by null relation scoping Follow up of #35868. Closes #19349. --- .../test/cases/scoping/relation_scoping_test.rb | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'activerecord/test') diff --git a/activerecord/test/cases/scoping/relation_scoping_test.rb b/activerecord/test/cases/scoping/relation_scoping_test.rb index 8ab0782bbf..50b514d464 100644 --- a/activerecord/test/cases/scoping/relation_scoping_test.rb +++ b/activerecord/test/cases/scoping/relation_scoping_test.rb @@ -421,6 +421,18 @@ class HasManyScopingTest < ActiveRecord::TestCase end end + def test_none_scoping + Comment.none.scoping do + assert_equal 2, @welcome.comments.count + assert_equal "a comment...", @welcome.comments.what_are_you + end + + Comment.where("1=1").scoping do + assert_equal 2, @welcome.comments.count + assert_equal "a comment...", @welcome.comments.what_are_you + end + end + def test_should_maintain_default_scope_on_associations magician = BadReference.find(1) assert_equal [magician], people(:michael).bad_references @@ -461,4 +473,16 @@ class HasAndBelongsToManyScopingTest < ActiveRecord::TestCase assert_equal "a category...", @welcome.categories.what_are_you end end + + def test_none_scoping + Category.none.scoping do + assert_equal 2, @welcome.categories.count + assert_equal "a category...", @welcome.categories.what_are_you + end + + Category.where("1=1").scoping do + assert_equal 2, @welcome.categories.count + assert_equal "a category...", @welcome.categories.what_are_you + end + end end -- cgit v1.2.3