diff options
| author | Ben Toews <mastahyeti@gmail.com> | 2017-09-25 10:58:08 -0600 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2017-11-09 22:39:48 +1030 |
| commit | 02a17492a937d4b423590644ad1481b82facd394 (patch) | |
| tree | fe6a27b94d8e2ae46f9f4f1bd1a53b3c0f7f1ff5 /activerecord/test/cases/scoping/relation_scoping_test.rb | |
| parent | 40d302d880f247ef9547708b1d26a390945b6fe9 (diff) | |
| download | rails-02a17492a937d4b423590644ad1481b82facd394.tar.gz rails-02a17492a937d4b423590644ad1481b82facd394.tar.bz2 rails-02a17492a937d4b423590644ad1481b82facd394.zip | |
work around deprecation warnings in a bunch of tests
Diffstat (limited to 'activerecord/test/cases/scoping/relation_scoping_test.rb')
| -rw-r--r-- | activerecord/test/cases/scoping/relation_scoping_test.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/activerecord/test/cases/scoping/relation_scoping_test.rb b/activerecord/test/cases/scoping/relation_scoping_test.rb index 116f8e83aa..2a95204d0d 100644 --- a/activerecord/test/cases/scoping/relation_scoping_test.rb +++ b/activerecord/test/cases/scoping/relation_scoping_test.rb @@ -39,23 +39,23 @@ class RelationScopingTest < ActiveRecord::TestCase end def test_reverse_order - assert_equal Developer.order("id DESC").to_a.reverse, Developer.order("id DESC").reverse_order + assert_equal Developer.order(Arel.sql("id DESC")).to_a.reverse, Developer.order(Arel.sql("id DESC")).reverse_order end def test_reverse_order_with_arel_node - assert_equal Developer.order("id DESC").to_a.reverse, Developer.order(Developer.arel_table[:id].desc).reverse_order + assert_equal Developer.order(Arel.sql("id DESC")).to_a.reverse, Developer.order(Developer.arel_table[:id].desc).reverse_order end def test_reverse_order_with_multiple_arel_nodes - assert_equal Developer.order("id DESC").order("name DESC").to_a.reverse, Developer.order(Developer.arel_table[:id].desc).order(Developer.arel_table[:name].desc).reverse_order + assert_equal Developer.order(Arel.sql("id DESC")).order(Arel.sql("name DESC")).to_a.reverse, Developer.order(Developer.arel_table[:id].desc).order(Developer.arel_table[:name].desc).reverse_order end def test_reverse_order_with_arel_nodes_and_strings - assert_equal Developer.order("id DESC").order("name DESC").to_a.reverse, Developer.order("id DESC").order(Developer.arel_table[:name].desc).reverse_order + assert_equal Developer.order(Arel.sql("id DESC")).order(Arel.sql("name DESC")).to_a.reverse, Developer.order(Arel.sql("id DESC")).order(Developer.arel_table[:name].desc).reverse_order end def test_double_reverse_order_produces_original_order - assert_equal Developer.order("name DESC"), Developer.order("name DESC").reverse_order.reverse_order + assert_equal Developer.order(Arel.sql("name DESC")), Developer.order(Arel.sql("name DESC")).reverse_order.reverse_order end def test_scoped_find @@ -72,7 +72,7 @@ class RelationScopingTest < ActiveRecord::TestCase end def test_scoped_find_last - highest_salary = Developer.order("salary DESC").first + highest_salary = Developer.order(Arel.sql("salary DESC")).first Developer.order("salary").scoping do assert_equal highest_salary, Developer.last @@ -80,8 +80,8 @@ class RelationScopingTest < ActiveRecord::TestCase end def test_scoped_find_last_preserves_scope - lowest_salary = Developer.order("salary ASC").first - highest_salary = Developer.order("salary DESC").first + lowest_salary = Developer.order(Arel.sql("salary ASC")).first + highest_salary = Developer.order(Arel.sql("salary DESC")).first Developer.order("salary").scoping do assert_equal highest_salary, Developer.last |