2 files changed, 81 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation/where_chain_test.rb b/activerecord/test/cases/relation/where_chain_test.rb
new file mode 100644
index 0000000000..8ce44636b4
--- /dev/null
+++ b/activerecord/test/cases/relation/where_chain_test.rb
@@ -0,0 +1,75 @@
+require 'cases/helper'
+require 'models/post'
+require 'models/comment'
+
+module ActiveRecord
+  class WhereChainTest < ActiveRecord::TestCase
+    fixtures :posts
+
+    def test_not_eq
+      expected = Arel::Nodes::NotEqual.new(Post.arel_table[:title], 'hello')
+      relation = Post.where.not(title: 'hello')
+      assert_equal([expected], relation.where_values)
+    end
+
+    def test_not_null
+      expected = Arel::Nodes::NotEqual.new(Post.arel_table[:title], nil)
+      relation = Post.where.not(title: nil)
+      assert_equal([expected], relation.where_values)
+    end
+
+    def test_not_in
+      expected = Arel::Nodes::NotIn.new(Post.arel_table[:title], %w[hello goodbye])
+      relation = Post.where.not(title: %w[hello goodbye])
+      assert_equal([expected], relation.where_values)
+    end
+
+    def test_association_not_eq
+      expected = Arel::Nodes::NotEqual.new(Comment.arel_table[:title], 'hello')
+      relation = Post.joins(:comments).where.not(comments: {title: 'hello'})
+      assert_equal(expected.to_sql, relation.where_values.first.to_sql)
+    end
+
+    def test_not_eq_with_preceding_where
+      relation = Post.where(title: 'hello').where.not(title: 'world')
+
+      expected = Arel::Nodes::Equality.new(Post.arel_table[:title], 'hello')
+      assert_equal(expected, relation.where_values.first)
+
+      expected = Arel::Nodes::NotEqual.new(Post.arel_table[:title], 'world')
+      assert_equal(expected, relation.where_values.last)
+    end
+
+    def test_not_eq_with_succeeding_where
+      relation = Post.where.not(title: 'hello').where(title: 'world')
+
+      expected = Arel::Nodes::NotEqual.new(Post.arel_table[:title], 'hello')
+      assert_equal(expected, relation.where_values.first)
+
+      expected = Arel::Nodes::Equality.new(Post.arel_table[:title], 'world')
+      assert_equal(expected, relation.where_values.last)
+    end
+
+    def test_not_eq_with_string_parameter
+      expected = Arel::Nodes::Not.new("title = 'hello'")
+      relation = Post.where.not("title = 'hello'")
+      assert_equal([expected], relation.where_values)
+    end
+
+    def test_not_eq_with_array_parameter
+      expected = Arel::Nodes::Not.new("title = 'hello'")
+      relation = Post.where.not(['title = ?', 'hello'])
+      assert_equal([expected], relation.where_values)
+    end
+
+    def test_chaining_multiple
+      relation = Post.where.not(author_id: [1, 2]).where.not(title: 'ruby on rails')
+
+      expected = Arel::Nodes::NotIn.new(Post.arel_table[:author_id], [1, 2])
+      assert_equal(expected, relation.where_values[0])
+
+      expected = Arel::Nodes::NotEqual.new(Post.arel_table[:title], 'ruby on rails')
+      assert_equal(expected, relation.where_values[1])
+    end
+  end
+end
diff --git a/activerecord/test/cases/relation/where_test.rb b/activerecord/test/cases/relation/where_test.rb
index 9c0b139dbf..297e865308 100644
--- a/activerecord/test/cases/relation/where_test.rb
+++ b/activerecord/test/cases/relation/where_test.rb
@@ -85,5 +85,11 @@ module ActiveRecord
     def test_where_with_empty_hash_and_no_foreign_key
       assert_equal 0, Edge.where(:sink => {}).count
     end
+
+    def test_where_with_blank_conditions
+      [[], {}, nil, ""].each do |blank|
+        assert_equal 4, Edge.where(blank).order("sink_id").to_a.size
+      end
+    end
   end
 end