aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-01-14 17:47:10 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-01-14 17:47:10 -0800
commit8d146c8bec3a33052116ca5730151dc44d766222 (patch)
treeb490da102650663892c7a4e317dde818828212b2 /activerecord
parent3204bbf8798e3203faad59bf26c3a6b3cb3de4e6 (diff)
downloadrails-8d146c8bec3a33052116ca5730151dc44d766222.tar.gz
rails-8d146c8bec3a33052116ca5730151dc44d766222.tar.bz2
rails-8d146c8bec3a33052116ca5730151dc44d766222.zip
rm dup code
https://github.com/rails/rails/blob/e64a83cdbd3ce836f3339c600c1006b20c23d8fd/activerecord/test/cases/relation/merging_test.rb#L80-91
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/relations_test.rb13
1 files changed, 0 insertions, 13 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index a0896f7f8d..afd5a69cef 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1511,19 +1511,6 @@ class RelationTest < ActiveRecord::TestCase
assert !Post.all.respond_to?(:by_lifo)
end
- test "merge collapses wheres from the LHS only" do
- left = Post.where(title: "omg").where(comments_count: 1)
- right = Post.where(title: "wtf").where(title: "bbq")
-
- expected = [left.where_values[1]] + right.where_values
- merged = left.merge(right)
-
- assert_equal expected, merged.where_values
- assert !merged.to_sql.include?("omg")
- assert merged.to_sql.include?("wtf")
- assert merged.to_sql.include?("bbq")
- end
-
def test_unscope_removes_binds
left = Post.where(id: Arel::Nodes::BindParam.new('?'))
column = Post.columns_hash['id']