diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 408953b..44e07a2 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -260,6 +260,13 @@ def test_relation_merging_with_merged_joins_as_strings
assert_equal 3, authors(:david).posts.merge(posts_with_special_comments_with_ratings).count.length
end
+ def test_merge_raises_with_invalid_argument
+ assert_raises ArgumentError do
+ relation = Relation.new(FakeKlass, :b)
+ relation.merge(true)
+ end
+ end
+
class EnsureRoundTripTypeCasting < ActiveRecord::Type::Value
def type
:string