aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2014-12-26 17:50:20 -0700
committerSean Griffin <sean@thoughtbot.com>2014-12-26 17:50:20 -0700
commitde0cfd27a54545131d3ae756eb725a91ab4f0907 (patch)
treece25c5edf649affde16a660fb9cb40b72968fc08 /activerecord/test
parent108df8cc90fc32ca08ff1cc86bc79ceb03ee1bfc (diff)
downloadrails-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')
-rw-r--r--activerecord/test/cases/relation/merging_test.rb4
-rw-r--r--activerecord/test/cases/relation/where_chain_test.rb2
-rw-r--r--activerecord/test/models/author.rb2
3 files changed, 4 insertions, 4 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
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb
index 8c1f14bd36..9b740e405a 100644
--- a/activerecord/test/models/author.rb
+++ b/activerecord/test/models/author.rb
@@ -34,7 +34,7 @@ class Author < ActiveRecord::Base
-> { where(title: 'Welcome to the weblog').where('comments_count = ?', 1) },
class_name: 'Post'
has_many :welcome_posts_with_comments,
- -> { where(title: 'Welcome to the weblog').where(Post.arel_table[:comments_count].gt(0)) },
+ -> { where(title: 'Welcome to the weblog').where(Post.arel_table[:comments_count].gt(Arel::Nodes::Quoted.new(0))) },
class_name: 'Post'
has_many :comments_desc, -> { order('comments.id DESC') }, :through => :posts, :source => :comments