Make Relation#extending work like other value methods

1 files changed, 9 insertions, 8 deletions

diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index c1063698bd..fdd8e2112e 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -156,7 +156,7 @@ module ActiveRecord
       @relation ||= Relation.new :a, :b
     end
 
-    (Relation::MULTI_VALUE_METHODS - [:references]).each do |method|
+    (Relation::MULTI_VALUE_METHODS - [:references, :extending]).each do |method|
       test "##{method}!" do
         assert relation.public_send("#{method}!", :foo).equal?(relation)
         assert_equal [:foo], relation.public_send("#{method}_values")
@@ -168,6 +168,14 @@ module ActiveRecord
       assert relation.references_values.include?('foo')
     end
 
+    test 'extending!' do
+      mod = Module.new
+
+      assert relation.extending!(mod).equal?(relation)
+      assert [mod], relation.extending_values
+      assert relation.is_a?(mod)
+    end
+
     (Relation::SINGLE_VALUE_METHODS - [:lock, :reordering, :reverse_order, :create_with]).each do |method|
       test "##{method}!" do
         assert relation.public_send("#{method}!", :foo).equal?(relation)
@@ -195,13 +203,6 @@ module ActiveRecord
       assert !relation.reverse_order_value
     end
 
-    test 'extending!' do
-      mod = Module.new
-
-      assert relation.extending!(mod).equal?(relation)
-      assert relation.is_a?(mod)
-    end
-
     test 'create_with!' do
       assert relation.create_with!(foo: 'bar').equal?(relation)
       assert_equal({foo: 'bar'}, relation.create_with_value)