diff options
Diffstat (limited to 'spec/features/admin/admin_mode/workers_spec.rb')
-rw-r--r-- | spec/features/admin/admin_mode/workers_spec.rb | 54 |
1 files changed, 12 insertions, 42 deletions
diff --git a/spec/features/admin/admin_mode/workers_spec.rb b/spec/features/admin/admin_mode/workers_spec.rb index 12f5e20e176..8405e9132b6 100644 --- a/spec/features/admin/admin_mode/workers_spec.rb +++ b/spec/features/admin/admin_mode/workers_spec.rb @@ -37,56 +37,26 @@ RSpec.describe 'Admin mode for workers', :request_store do gitlab_enable_admin_mode_sign_in(user) end - context 'when user_destroy_with_limited_execution_time_worker is enabled' do - it 'can delete user', :js do - visit admin_user_path(user_to_delete) - - click_action_in_user_dropdown(user_to_delete.id, 'Delete user') - - page.within '.modal-dialog' do - find("input[name='username']").send_keys(user_to_delete.name) - click_button 'Delete user' - - wait_for_requests - end - - expect(page).to have_content('The user is being deleted.') - - # Perform jobs while logged out so that admin mode is only enabled in job metadata - execute_jobs_signed_out(user) + it 'can delete user', :js do + visit admin_user_path(user_to_delete) - visit admin_user_path(user_to_delete) + click_action_in_user_dropdown(user_to_delete.id, 'Delete user') - expect(find('h1.page-title')).to have_content('(Blocked)') - end - end + page.within '.modal-dialog' do + find("input[name='username']").send_keys(user_to_delete.name) + click_button 'Delete user' - context 'when user_destroy_with_limited_execution_time_worker is disabled' do - before do - stub_feature_flags(user_destroy_with_limited_execution_time_worker: false) + wait_for_requests end - it 'can delete user', :js do - visit admin_user_path(user_to_delete) - - click_action_in_user_dropdown(user_to_delete.id, 'Delete user') - - page.within '.modal-dialog' do - find("input[name='username']").send_keys(user_to_delete.name) - click_button 'Delete user' - - wait_for_requests - end + expect(page).to have_content('The user is being deleted.') - expect(page).to have_content('The user is being deleted.') + # Perform jobs while logged out so that admin mode is only enabled in job metadata + execute_jobs_signed_out(user) - # Perform jobs while logged out so that admin mode is only enabled in job metadata - execute_jobs_signed_out(user) - - visit admin_user_path(user_to_delete) + visit admin_user_path(user_to_delete) - expect(page).to have_title('Not Found') - end + expect(find('h1.page-title')).to have_content('(Blocked)') end end end |