aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation_test.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-04-06 12:00:17 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-04-06 12:00:17 +0900
commit0856f7c744e631b6efafbb14d01e60bbfaa593f5 (patch)
treef360e33010b419387e15722854467167b8ab7fe3 /activerecord/test/cases/relation_test.rb
parent56b4fdb52bd327d42aec9ee3dcea01298aafe945 (diff)
downloadrails-0856f7c744e631b6efafbb14d01e60bbfaa593f5.tar.gz
rails-0856f7c744e631b6efafbb14d01e60bbfaa593f5.tar.bz2
rails-0856f7c744e631b6efafbb14d01e60bbfaa593f5.zip
There is no need to check `null_relation?` in `empty_scope?`
`values[:extending]` includes `NullRelation` if `null_relation?`.
Diffstat (limited to 'activerecord/test/cases/relation_test.rb')
-rw-r--r--activerecord/test/cases/relation_test.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 00a7b3841f..90b208092f 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -101,6 +101,9 @@ module ActiveRecord
relation.merge!(relation)
assert_predicate relation, :empty_scope?
+
+ assert_not_predicate NullPost.all, :empty_scope?
+ assert_not_predicate FirstPost.all, :empty_scope?
end
def test_bad_constants_raise_errors