Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 16 insertions, 2 deletions

diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb
index c36a742af6b..119e09f9b09 100644
--- a/spec/features/admin/admin_groups_spec.rb
+++ b/spec/features/admin/admin_groups_spec.rb
@@ -204,6 +204,17 @@ RSpec.describe 'Admin Groups', feature_category: :subgroups do
 
       expect(page).to have_content(new_admin_note_text)
     end
+
+    it 'hides removed note' do
+      group = create(:group, :private)
+      group.create_admin_note(note: 'A note by an administrator')
+
+      visit admin_group_edit_path(group)
+      fill_in 'group_admin_note_attributes_note', with: ''
+      click_button 'Save changes'
+
+      expect(page).not_to have_content(s_('Admin|Admin notes'))
+    end
   end
 
   describe 'add user into a group', :js do
@@ -258,9 +269,12 @@ RSpec.describe 'Admin Groups', feature_category: :subgroups do
         expect(page).to have_content('Developer')
       end
 
-      find_member_row(current_user).click_button(title: 'Leave')
+      show_actions_for_username(current_user)
+      click_button _('Leave group')
 
-      accept_gl_confirm(button_text: 'Leave')
+      within_modal do
+        click_button _('Leave')
+      end
 
       wait_for_all_requests