diff options
author | Matthew Draper <matthew@trebex.net> | 2017-05-28 23:35:50 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-28 23:35:50 +0930 |
commit | aa3f4036c144ba2ab46d0ebac7a41bf18c8b6f47 (patch) | |
tree | 4c8f662cd322a9311987e14d984b4f29abd7cbc3 /activerecord/test/cases | |
parent | 352865d0f835c24daa9a2e9863dcc9dde9e5371a (diff) | |
parent | 2ee96632b640da0d09b164ed67b1a9f6b96594b3 (diff) | |
download | rails-aa3f4036c144ba2ab46d0ebac7a41bf18c8b6f47.tar.gz rails-aa3f4036c144ba2ab46d0ebac7a41bf18c8b6f47.tar.bz2 rails-aa3f4036c144ba2ab46d0ebac7a41bf18c8b6f47.zip |
Merge pull request #29003 from kamipo/delegate_ast_and_locked_to_arel_explicitly
Delegate `ast` and `locked` to `arel` explicitly
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb index 64866eaf2d..c3b39a9295 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -56,7 +56,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.present? + assert devs.locked? end def test_relation_merging_with_preload |