Merge branch 'if-10137-ee_specific_lines_groups_api_refactored' into 'master'

Refactor EE specific params override in API::Groups

See merge request gitlab-org/gitlab-ee!13175

ee/lib/ee/api/helpers/groups_helpers.rb

@@ -7,21 +7,17 @@ module EE
         extend ActiveSupport::Concern
 
         prepended do
-          included do
-            helpers do
-              params :optional_params_ee do
-                optional :membership_lock, type: ::Grape::API::Boolean, desc: 'Prevent adding new members to project membership within this group'
-                optional :ldap_cn, type: String, desc: 'LDAP Common Name'
-                optional :ldap_access, type: Integer, desc: 'A valid access level'
-                optional :shared_runners_minutes_limit, type: Integer, desc: '(admin-only) Pipeline minutes quota for this group'
-                optional :extra_shared_runners_minutes_limit, type: Integer, desc: '(admin-only) Extra pipeline minutes quota for this group'
-                all_or_none_of :ldap_cn, :ldap_access
-              end
+          params :optional_params_ee do
+            optional :membership_lock, type: ::Grape::API::Boolean, desc: 'Prevent adding new members to project membership within this group'
+            optional :ldap_cn, type: String, desc: 'LDAP Common Name'
+            optional :ldap_access, type: Integer, desc: 'A valid access level'
+            optional :shared_runners_minutes_limit, type: Integer, desc: '(admin-only) Pipeline minutes quota for this group'
+            optional :extra_shared_runners_minutes_limit, type: Integer, desc: '(admin-only) Extra pipeline minutes quota for this group'
+            all_or_none_of :ldap_cn, :ldap_access
+          end
 
-              params :optional_update_params_ee do
-                optional :file_template_project_id, type: Integer, desc: 'The ID of a project to use for custom templates in this group'
-              end
-            end
+          params :optional_update_params_ee do
+            optional :file_template_project_id, type: Integer, desc: 'The ID of a project to use for custom templates in this group'
           end
         end
       end

ee/spec/requests/api/members_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe API::Members do

lib/api/groups.rb

@@ -7,34 +7,9 @@ module API
 
     before { authenticate_non_get! }
 
-    helpers do
-      params :optional_params_ce do
-        optional :description, type: String, desc: 'The description of the group'
-        optional :visibility, type: String,
-                              values: Gitlab::VisibilityLevel.string_values,
-                              default: Gitlab::VisibilityLevel.string_level(
-                                Gitlab::CurrentSettings.current_application_settings.default_group_visibility),
-                              desc: 'The visibility of the group'
-        optional :lfs_enabled, type: Boolean, desc: 'Enable/disable LFS for the projects in this group'
-        optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access'
-        optional :share_with_group_lock, type: Boolean, desc: 'Prevent sharing a project with another group within this group'
-      end
-
-      params :optional_params_ee do
-      end
-
-      params :optional_update_params_ee do
-      end
-    end
-
-    include ::API::Helpers::GroupsHelpers
+    helpers Helpers::GroupsHelpers
 
     helpers do
-      params :optional_params do
-        use :optional_params_ce
-        use :optional_params_ee
-      end
-
       params :statistics_params do
         optional :statistics, type: Boolean, default: false, desc: 'Include project statistics'
       end

lib/api/helpers/groups_helpers.rb

@@ -4,6 +4,30 @@ module API
   module Helpers
     module GroupsHelpers
       extend ActiveSupport::Concern
+      extend Grape::API::Helpers
+
+      params :optional_params_ce do
+        optional :description, type: String, desc: 'The description of the group'
+        optional :visibility, type: String,
+                 values: Gitlab::VisibilityLevel.string_values,
+                 default: Gitlab::VisibilityLevel.string_level(
+                   Gitlab::CurrentSettings.current_application_settings.default_group_visibility),
+                 desc: 'The visibility of the group'
+        optional :lfs_enabled, type: Boolean, desc: 'Enable/disable LFS for the projects in this group'
+        optional :request_access_enabled, type: Boolean, desc: 'Allow users to request member access'
+        optional :share_with_group_lock, type: Boolean, desc: 'Prevent sharing a project with another group within this group'
+      end
+
+      params :optional_params_ee do
+      end
+
+      params :optional_update_params_ee do
+      end
+
+      params :optional_params do
+        use :optional_params_ce
+        use :optional_params_ee
+      end
     end
   end
 end