Add cr remarks

Fix specs

Fix specs

app/helpers/groups/group_members_helper.rb

@@ -10,11 +10,7 @@ module Groups::GroupMembersHelper
   end
 
   def render_invite_member_for_group(group, default_access_level)
-    render 'shared/members/invite_member', submit_url: group_group_members_path(group), access_levels: access_level_roles(group), default_access_level: default_access_level
-  end
-
-  def access_level_roles(group)
-    GroupMember.access_level_roles
+    render 'shared/members/invite_member', submit_url: group_group_members_path(group), access_levels: group.access_level_roles, default_access_level: default_access_level
   end
 
   def linked_groups_data_json(group_links)

app/models/group.rb

@@ -575,12 +575,12 @@ class Group < Namespace
     owners.first || parent&.default_owner || owner
   end
 
-  def access_level_roles_for_group
+  def access_level_roles
     GroupMember.access_level_roles
   end
 
-  def access_level_values_for_group
-    access_level_roles_for_group.values
+  def access_level_values
+    access_level_roles.values
   end
 
   private

app/views/admin/groups/show.html.haml

@@ -113,7 +113,7 @@
             %div
               = users_select_tag(:user_ids, multiple: true, email_user: true, skip_ldap: @group.ldap_synced?, scope: :all)
             .gl-mt-3
-              = select_tag :access_level, options_for_select(@group.access_level_roles_for_group), class: "project-access-select select2"
+              = select_tag :access_level, options_for_select(@group.access_level_roles), class: "project-access-select select2"
             %hr
             = button_tag _('Add users to group'), class: "btn btn-success"
       = render 'shared/members/requests', membership_source: @group, requesters: @requesters, force_mobile_view: true

ee/app/helpers/ee/groups/group_members_helper.rb

@@ -8,11 +8,6 @@ module EE::Groups::GroupMembersHelper
     super.merge(skip_ldap: @group.ldap_synced?)
   end
 
-  override :access_level_roles
-  def access_level_roles(group)
-    group.access_level_roles_for_group
-  end
-
   private
 
   override :members_data

ee/app/models/ee/group.rb

@@ -408,8 +408,8 @@ module EE
       minimal_access_role_allowed? ? ::Gitlab::Access::MINIMAL_ACCESS : ::Gitlab::Access::GUEST
     end
 
-    override :access_level_roles_for_group
-    def access_level_roles_for_group
+    override :access_level_roles
+    def access_level_roles
       levels = ::GroupMember.access_level_roles
       return levels unless minimal_access_role_allowed?
 

ee/app/models/ee/group_member.rb

@@ -81,7 +81,7 @@ module EE
 
     override :access_level_inclusion
     def access_level_inclusion
-      levels = source.access_level_values_for_group
+      levels = source.access_level_values
       return if access_level.in?(levels)
 
       errors.add(:access_level, "is not included in the list")

ee/app/models/saml_provider.rb

@@ -86,7 +86,7 @@ class SamlProvider < ApplicationRecord
   def access_level_inclusion
     return errors.add(:default_membership_role, "is dependent on a group") unless group
 
-    levels = group.access_level_values_for_group
+    levels = group.access_level_values
     return if default_membership_role.in?(levels)
 
     errors.add(:default_membership_role, "is not included in the list")

ee/app/presenters/ee/group_member_presenter.rb

@@ -14,7 +14,7 @@ module EE
 
     override :access_level_roles
     def access_level_roles
-      member.source.access_level_roles_for_group
+      member.source.access_level_roles
     end
 
     private

ee/app/presenters/ee/member_presenter.rb

@@ -18,9 +18,5 @@ module EE
     def override_member_permission
       raise NotImplementedError
     end
-
-    def source_allows_minimal_access_role?(member)
-      member.source.minimal_access_role_allowed?
-    end
   end
 end

ee/app/views/groups/saml_providers/_form.html.haml

@@ -53,7 +53,7 @@
     .well-segment.borderless.gl-mb-3.col-12.col-lg-9.gl-p-0
       = f.label :default_membership_role, class: 'label-bold' do
         = s_('GroupSAML|Default membership role')
-      = f.select :default_membership_role, options_for_select(group.access_level_roles_for_group, saml_provider.default_membership_role), {}, class: 'form-control', data: { qa_selector: 'default_membership_role_dropdown' }
+      = f.select :default_membership_role, options_for_select(group.access_level_roles, saml_provider.default_membership_role), {}, class: 'form-control', data: { qa_selector: 'default_membership_role_dropdown' }
       .form-text.text-muted
         = s_('GroupSAML|This will be set as the access level of users added to the group.')
 

ee/spec/models/group_member_spec.rb

@@ -129,7 +129,7 @@ RSpec.describe GroupMember do
         context 'when group is a subgroup' do
           let(:subgroup) { create(:group, parent: group) }
 
-          it 'users can have access levels from guest to owner' do
+          it 'users cannot have minimal access level' do
             expect(build(:group_member, group: subgroup, user: create(:user), access_level: ::Gitlab::Access::MINIMAL_ACCESS)).to be_invalid
           end
         end

ee/spec/models/group_spec.rb

@@ -705,7 +705,7 @@ RSpec.describe Group do
     context 'with `minimal_access_role` not licensed' do
       before do
         stub_licensed_features(minimal_access_role: false)
-        create(:group_member, :minimal_access, user: user, group: group)
+        create(:group_member, :minimal_access, user: user, source: group)
       end
 
       it { is_expected.to be_falsey }

ee/spec/presenters/group_member_presenter_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe GroupMemberPresenter do
       before do
         allow(group_member).to receive(:highest_group_member)
         allow(group_member).to receive_message_chain(:class, :access_level_roles).and_return(::Gitlab::Access.options_with_owner)
-        expect(group).to receive(:access_level_roles_for_group).and_return(::Gitlab::Access.options_with_minimal_access)
+        expect(group).to receive(:access_level_roles).and_return(::Gitlab::Access.options_with_minimal_access)
       end
 
       it { expect(presenter.valid_level_roles).to eq(::Gitlab::Access.options_with_minimal_access) }