diff options
Diffstat (limited to 'activerecord/test/cases/relation/merging_test.rb')
| -rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index e699b4176a..a8891c96c6 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -58,7 +58,7 @@ class RelationMergingTest < ActiveRecord::TestCase def test_relation_merging_with_locks devs = Developer.lock.where("salary >= 80000").order("id DESC").merge(Developer.limit(2)) - assert devs.locked? + assert_predicate devs, :locked? end def test_relation_merging_with_preload @@ -113,9 +113,9 @@ class RelationMergingTest < ActiveRecord::TestCase def test_merging_with_from_clause relation = Post.all - assert relation.from_clause.empty? + assert_predicate relation.from_clause, :empty? relation = relation.merge(Post.from("posts")) - assert_not relation.from_clause.empty? + assert_not_predicate relation.from_clause, :empty? end end |