diff options
author | Sean Griffin <sean@thoughtbot.com> | 2014-12-26 17:50:20 -0700 |
---|---|---|
committer | Sean Griffin <sean@thoughtbot.com> | 2014-12-26 17:50:20 -0700 |
commit | de0cfd27a54545131d3ae756eb725a91ab4f0907 (patch) | |
tree | ce25c5edf649affde16a660fb9cb40b72968fc08 /activerecord/test/cases | |
parent | 108df8cc90fc32ca08ff1cc86bc79ceb03ee1bfc (diff) | |
download | rails-de0cfd27a54545131d3ae756eb725a91ab4f0907.tar.gz rails-de0cfd27a54545131d3ae756eb725a91ab4f0907.tar.bz2 rails-de0cfd27a54545131d3ae756eb725a91ab4f0907.zip |
Inform Arel we don't need additional type casting in tests
Part of the larger refactoring to remove type casting from Arel. We can
inform it that we already have the right type by wrapping the value in
an `Arel::Nodes::Quoted`. This commit can be reverted when we have
removed type casting from Arel in Rail 5.1
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/relation/merging_test.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/relation/where_chain_test.rb | 2 |
2 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 eb76ef6328..aa56df62fd 100644 --- a/activerecord/test/cases/relation/merging_test.rb +++ b/activerecord/test/cases/relation/merging_test.rb @@ -25,8 +25,8 @@ class RelationMergingTest < ActiveRecord::TestCase end def test_relation_merging_with_arel_equalities_keeps_last_equality - devs = Developer.where(Developer.arel_table[:salary].eq(80000)).merge( - Developer.where(Developer.arel_table[:salary].eq(9000)) + devs = Developer.where(Developer.arel_table[:salary].eq(Arel::Nodes::Quoted.new(80000))).merge( + Developer.where(Developer.arel_table[:salary].eq(Arel::Nodes::Quoted.new(9000))) ) assert_equal [developers(:poor_jamis)], devs.to_a end diff --git a/activerecord/test/cases/relation/where_chain_test.rb b/activerecord/test/cases/relation/where_chain_test.rb index f9d3badceb..24f6f1d2ab 100644 --- a/activerecord/test/cases/relation/where_chain_test.rb +++ b/activerecord/test/cases/relation/where_chain_test.rb @@ -43,7 +43,7 @@ module ActiveRecord end def test_association_not_eq - expected = Comment.arel_table[@name].not_eq('hello') + expected = Comment.arel_table[@name].not_eq(Arel::Nodes::Quoted.new('hello')) relation = Post.joins(:comments).where.not(comments: {title: 'hello'}) assert_equal(expected.to_sql, relation.where_values.first.to_sql) end |