From b95cc72429f83304b8e882c3637dfb3135a571ed Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Mon, 28 Dec 2009 14:24:52 +0530
Subject: Raise ArgumentError when trying to merge relations of different
 classes

---
 activerecord/test/cases/relations_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activerecord/test/cases')

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 61fcc7ca46..cf6708cc8b 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -353,4 +353,9 @@ class RelationTest < ActiveRecord::TestCase
       assert_queries(2) { assert posts.first.author }
     end
   end
+
+  def test_invalid_merge
+    assert_raises(ArgumentError) { Post.scoped & Developer.scoped }
+  end
+
 end
-- 
cgit v1.2.3