Merge pull request #6579 from amatsuda/null_relation_modulize

modulize AR::NullRelation

1 files changed, 6 insertions, 1 deletions

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 2dc8f0053b..90367df5ee 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -226,7 +226,6 @@ class RelationTest < ActiveRecord::TestCase
     assert_no_queries do
       assert_equal [], Developer.none
       assert_equal [], Developer.scoped.none
-      assert           Developer.none.is_a?(ActiveRecord::NullRelation)
     end
   end
 
@@ -236,6 +235,12 @@ class RelationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_none_chainable_to_existing_scope_extension_method
+    assert_no_queries do
+      assert_equal 1, Topic.anonymous_extension.none.one
+    end
+  end
+
   def test_none_chained_to_methods_firing_queries_straight_to_db
     assert_no_queries do
       assert_equal [],    Developer.none.pluck(:id) # => uses select_all