diff options
Diffstat (limited to 'spec/features/admin/users')
-rw-r--r-- | spec/features/admin/users/user_spec.rb | 3 | ||||
-rw-r--r-- | spec/features/admin/users/users_spec.rb | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/spec/features/admin/users/user_spec.rb b/spec/features/admin/users/user_spec.rb index 7e8dee9cc0b..18bb03f4617 100644 --- a/spec/features/admin/users/user_spec.rb +++ b/spec/features/admin/users/user_spec.rb @@ -10,7 +10,6 @@ RSpec.describe 'Admin::Users::User' do let_it_be(:current_user) { create(:admin) } before do - stub_feature_flags(bootstrap_confirmation_modals: false) sign_in(current_user) gitlab_enable_admin_mode_sign_in(current_user) end @@ -354,7 +353,7 @@ RSpec.describe 'Admin::Users::User' do expect(page).to have_content("Secondary email: #{secondary_email.email}") - accept_confirm { find("#remove_email_#{secondary_email.id}").click } + accept_gl_confirm { find("#remove_email_#{secondary_email.id}").click } expect(page).not_to have_content(secondary_email.email) end diff --git a/spec/features/admin/users/users_spec.rb b/spec/features/admin/users/users_spec.rb index a05e1531949..e5df6cc0fd3 100644 --- a/spec/features/admin/users/users_spec.rb +++ b/spec/features/admin/users/users_spec.rb @@ -10,7 +10,6 @@ RSpec.describe 'Admin::Users' do let_it_be(:current_user) { create(:admin) } before do - stub_feature_flags(bootstrap_confirmation_modals: false) sign_in(current_user) gitlab_enable_admin_mode_sign_in(current_user) end @@ -492,9 +491,7 @@ RSpec.describe 'Admin::Users' do within(:css, '.gl-mb-3 + .card') do click_link group.name end - within(:css, 'h3.page-title') do - expect(page).to have_content "Group: #{group.name}" - end + expect(page).to have_content "Group: #{group.name}" expect(page).to have_content project.name end @@ -506,8 +503,11 @@ RSpec.describe 'Admin::Users' do it 'allows group membership to be revoked', :js do page.within(first('.group_member')) do - accept_confirm { find('.btn[data-testid="remove-user"]').click } + find('.btn[data-testid="remove-user"]').click end + + accept_gl_confirm(button_text: 'Remove') + wait_for_requests expect(page).not_to have_selector('.group_member') |