diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-05-06 22:21:38 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-05-06 22:21:38 +0900 |
| commit | 2ee96632b640da0d09b164ed67b1a9f6b96594b3 (patch) | |
| tree | 0d469ebadd2ddf538b0efd2eac8b776675230864 /activerecord/test/cases | |
| parent | e5434b038985906f17b3663766a0588dd8998b17 (diff) | |
| download | rails-2ee96632b640da0d09b164ed67b1a9f6b96594b3.tar.gz rails-2ee96632b640da0d09b164ed67b1a9f6b96594b3.tar.bz2 rails-2ee96632b640da0d09b164ed67b1a9f6b96594b3.zip | |
Delegate `ast` and `locked` to `arel` explicitly
Currently `ast` and `locked` are used in the internal but delegating to
`arel` is depend on `method_missing`. If a model class is defined these
methods, `select_all` will be broken.
It should be delegated 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 |