aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-01-14 10:41:33 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-01-14 10:41:33 -0800
commitf4d600865c6bcb170f34d9ba5bfc8ace432fee8b (patch)
tree61f32e56adb75488ac8ccc19a60283c1107101cf /activerecord
parente2e9a1373ec757188c2aaaa5722c2f8858e6b897 (diff)
downloadrails-f4d600865c6bcb170f34d9ba5bfc8ace432fee8b.tar.gz
rails-f4d600865c6bcb170f34d9ba5bfc8ace432fee8b.tar.bz2
rails-f4d600865c6bcb170f34d9ba5bfc8ace432fee8b.zip
remove test that does not apply anymore
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/relation/merging_test.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb
index 23500bf5d8..3dc2c0ea11 100644
--- a/activerecord/test/cases/relation/merging_test.rb
+++ b/activerecord/test/cases/relation/merging_test.rb
@@ -90,22 +90,11 @@ class RelationMergingTest < ActiveRecord::TestCase
assert merged.to_sql.include?("bbq")
end
- def test_merging_removes_rhs_bind_parameters
- left = Post.where(id: Arel::Nodes::BindParam.new('?'))
- column = Post.columns_hash['id']
- left.bind_values += [[column, 20]]
- right = Post.where(id: 10)
-
- merged = left.merge(right)
- assert_equal [], merged.bind_values
- end
-
def test_merging_keeps_lhs_bind_parameters
column = Post.columns_hash['id']
binds = [[column, 20]]
- right = Post.where(id: Arel::Nodes::BindParam.new('?'))
- right.bind_values += binds
+ right = Post.where(id: 20)
left = Post.where(id: 10)
merged = left.merge(right)