Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 7 insertions, 77 deletions

diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb
index e5dad5ee4be..533d2118b30 100644
--- a/spec/features/groups/members/manage_members_spec.rb
+++ b/spec/features/groups/members/manage_members_spec.rb
@@ -15,42 +15,18 @@ RSpec.describe 'Groups > Members > Manage members' do
     sign_in(user1)
   end
 
-  shared_examples 'includes the correct Invite link' do |should_include, should_not_include|
-    it 'includes either the form or the modal trigger', :aggregate_failures do
+  shared_examples 'includes the correct Invite link' do |should_include|
+    it 'includes the modal trigger', :aggregate_failures do
       group.add_owner(user1)
 
       visit group_group_members_path(group)
 
       expect(page).to have_selector(should_include)
-      expect(page).not_to have_selector(should_not_include)
     end
   end
 
-  shared_examples 'does not include either invite modal or either invite form' do
-    it 'does not include either of the invite members or invite group modal buttons', :aggregate_failures do
-      expect(page).not_to have_selector '.js-invite-members-modal'
-      expect(page).not_to have_selector '.js-invite-group-modal'
-    end
-
-    it 'does not include either of the invite users or invite group forms', :aggregate_failures do
-      expect(page).not_to have_selector '.invite-users-form'
-      expect(page).not_to have_selector '.invite-group-form'
-    end
-  end
-
-  context 'when Invite Members modal is enabled' do
-    it_behaves_like 'includes the correct Invite link', '.js-invite-members-trigger', '.invite-users-form'
-    it_behaves_like 'includes the correct Invite link', '.js-invite-group-trigger', '.invite-group-form'
-  end
-
-  context 'when Invite Members modal is disabled' do
-    before do
-      stub_feature_flags(invite_members_group_modal: false)
-    end
-
-    it_behaves_like 'includes the correct Invite link', '.invite-users-form', '.js-invite-members-trigger'
-    it_behaves_like 'includes the correct Invite link', '.invite-group-form', '.js-invite-group-trigger'
-  end
+  it_behaves_like 'includes the correct Invite link', '.js-invite-members-trigger'
+  it_behaves_like 'includes the correct Invite link', '.js-invite-group-trigger'
 
   it 'update user to owner level', :js do
     group.add_owner(user1)
@@ -106,33 +82,6 @@ RSpec.describe 'Groups > Members > Manage members' do
     expect(page).to have_content('Invite "undisclosed_email@gitlab.com" by email')
   end
 
-  context 'when Invite Members modal is disabled' do
-    before do
-      stub_feature_flags(invite_members_group_modal: false)
-    end
-
-    it 'do not disclose email addresses', :js do
-      group.add_owner(user1)
-      create(:user, email: 'undisclosed_email@gitlab.com', name: "Jane 'invisible' Doe")
-
-      visit group_group_members_path(group)
-
-      find('.select2-container').click
-      select_input = find('.select2-input')
-
-      select_input.send_keys('@gitlab.com')
-      wait_for_requests
-
-      expect(page).to have_content('No matches found')
-
-      select_input.native.clear
-      select_input.send_keys('undisclosed_email@gitlab.com')
-      wait_for_requests
-
-      expect(page).to have_content('Invite "undisclosed_email@gitlab.com" by email')
-    end
-  end
-
   it 'remove user from group', :js do
     group.add_owner(user1)
     group.add_developer(user2)
@@ -205,30 +154,11 @@ RSpec.describe 'Groups > Members > Manage members' do
       visit group_group_members_path(group)
     end
 
-    it_behaves_like 'does not include either invite modal or either invite form'
-
-    it 'does not include a button on the members page list to manage or remove the existing member', :js, :aggregate_failures do
-      page.within(second_row) do
-        # Can not modify user2 role
-        expect(page).not_to have_button 'Developer'
-
-        # Can not remove user2
-        expect(page).not_to have_selector 'button[title="Remove member"]'
-      end
-    end
-  end
-
-  context 'when user is a guest and the :invite_members_group_modal feature flag is disabled' do
-    before do
-      stub_feature_flags(invite_members_group_modal: false)
-      group.add_guest(user1)
-      group.add_developer(user2)
-
-      visit group_group_members_path(group)
+    it 'does not include either of the invite members or invite group modal buttons', :aggregate_failures do
+      expect(page).not_to have_selector '.js-invite-members-modal'
+      expect(page).not_to have_selector '.js-invite-group-modal'
     end
 
-    it_behaves_like 'does not include either invite modal or either invite form'
-
     it 'does not include a button on the members page list to manage or remove the existing member', :js, :aggregate_failures do
       page.within(second_row) do
         # Can not modify user2 role