Change Grape::API's @setup var to an Array (from a Set) (#2529)

Haerezis · web-flow · commit af1a6a2384a4 · 2025-02-02T15:49:28.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@
 * [#2525](https://github.com/ruby-grape/grape/pull/2525): Require logger before active_support - [@ericproulx](https://github.com/ericproulx).
 * [#2524](https://github.com/ruby-grape/grape/pull/2524): Fix validators bad encoding - [@ericproulx](https://github.com/ericproulx).
 * [#2530](https://github.com/ruby-grape/grape/pull/2530): Fix endpoint's status when rescue_from without a block - [@ericproulx](https://github.com/ericproulx).
+* [#2529](https://github.com/ruby-grape/grape/pull/2529): Fix missing settings on mounted routes (when settings are identical) - [@Haerezis](https://github.com/Haerezis).
 * Your contribution here.
 
 ### 2.2.0 (2024-09-14)
diff --git a/lib/grape/api.rb b/lib/grape/api.rb
@@ -40,7 +40,7 @@ def inherited(api)
       # an instance that will be used to create the set up but will not be mounted
       def initial_setup(base_instance_parent)
         @instances = []
-        @setup = Set.new
+        @setup = []
         @base_parent = base_instance_parent
         @base_instance = mount_instance
       end
diff --git a/spec/grape/api_remount_spec.rb b/spec/grape/api_remount_spec.rb
@@ -505,5 +505,65 @@ def printed_response
         end
       end
     end
+
+    context 'with route settings' do
+      before do
+        a_remounted_api.desc 'Identical description'
+        a_remounted_api.route_setting :custom, key: 'value'
+        a_remounted_api.route_setting :custom_diff, key: 'foo'
+        a_remounted_api.get '/api1' do
+          status 200
+        end
+
+        a_remounted_api.desc 'Identical description'
+        a_remounted_api.route_setting :custom, key: 'value'
+        a_remounted_api.route_setting :custom_diff, key: 'bar'
+        a_remounted_api.get '/api2' do
+          status 200
+        end
+      end
+
+      it 'has all the settings for both routes' do
+        expect(a_remounted_api.routes.count).to be(2)
+        expect(a_remounted_api.routes[0].settings).to include(
+          {
+            description: { description: 'Identical description' },
+            custom: { key: 'value' },
+            custom_diff: { key: 'foo' }
+          }
+        )
+        expect(a_remounted_api.routes[1].settings).to include(
+          {
+            description: { description: 'Identical description' },
+            custom: { key: 'value' },
+            custom_diff: { key: 'bar' }
+          }
+        )
+      end
+
+      context 'when mounting it' do
+        before do
+          root_api.mount a_remounted_api
+        end
+
+        it 'still has all the settings for both routes' do
+          expect(root_api.routes.count).to be(2)
+          expect(root_api.routes[0].settings).to include(
+            {
+              description: { description: 'Identical description' },
+              custom: { key: 'value' },
+              custom_diff: { key: 'foo' }
+            }
+          )
+          expect(root_api.routes[1].settings).to include(
+            {
+              description: { description: 'Identical description' },
+              custom: { key: 'value' },
+              custom_diff: { key: 'bar' }
+            }
+          )
+        end
+      end
+    end
   end
 end
