diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 14:02:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 14:02:35 +0300 |
commit | 434a0ce52d75e13d48eac9ce83774954c7c5d48d (patch) | |
tree | de3b7a7cf1ce8b07555f28df592297c76894c90f /spec/features/admin | |
parent | 0a0d9493ca481c56b739a3df27c31262283150fe (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc2
Diffstat (limited to 'spec/features/admin')
36 files changed, 137 insertions, 36 deletions
diff --git a/spec/features/admin/admin_abuse_reports_spec.rb b/spec/features/admin/admin_abuse_reports_spec.rb index 845e186dd5b..192182adddc 100644 --- a/spec/features/admin/admin_abuse_reports_spec.rb +++ b/spec/features/admin/admin_abuse_reports_spec.rb @@ -7,7 +7,9 @@ RSpec.describe "Admin::AbuseReports", :js do context 'as an admin' do before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end describe 'if a user has been reported for abuse' do diff --git a/spec/features/admin/admin_appearance_spec.rb b/spec/features/admin/admin_appearance_spec.rb index 48aaec6e6df..67a8d6ec601 100644 --- a/spec/features/admin/admin_appearance_spec.rb +++ b/spec/features/admin/admin_appearance_spec.rb @@ -4,9 +4,11 @@ require 'spec_helper' RSpec.describe 'Admin Appearance' do let!(:appearance) { create(:appearance) } + let(:admin) { create(:admin) } it 'Create new appearance' do - sign_in(create(:admin)) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) visit admin_appearances_path fill_in 'appearance_title', with: 'MyCompany' @@ -26,7 +28,8 @@ RSpec.describe 'Admin Appearance' do end it 'Preview sign-in page appearance' do - sign_in(create(:admin)) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) visit admin_appearances_path click_link "Sign-in page" @@ -35,7 +38,8 @@ RSpec.describe 'Admin Appearance' do end it 'Preview new project page appearance' do - sign_in(create(:admin)) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) visit admin_appearances_path click_link "New project page" @@ -45,7 +49,8 @@ RSpec.describe 'Admin Appearance' do context 'Custom system header and footer' do before do - sign_in(create(:admin)) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end context 'when system header and footer messages are empty' do @@ -82,7 +87,8 @@ RSpec.describe 'Admin Appearance' do end it 'Custom new project page' do - sign_in create(:user) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) visit new_project_path expect_custom_new_project_appearance(appearance) @@ -91,6 +97,7 @@ RSpec.describe 'Admin Appearance' do context 'Profile page with custom profile image guidelines' do before do sign_in(create(:admin)) + gitlab_enable_admin_mode_sign_in(admin) visit admin_appearances_path fill_in 'appearance_profile_image_guidelines', with: 'Custom profile image guidelines, please :smile:!' click_button 'Update appearance settings' @@ -105,7 +112,8 @@ RSpec.describe 'Admin Appearance' do end it 'Appearance logo' do - sign_in(create(:admin)) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) visit admin_appearances_path attach_file(:appearance_logo, logo_fixture) @@ -117,7 +125,8 @@ RSpec.describe 'Admin Appearance' do end it 'Header logos' do - sign_in(create(:admin)) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) visit admin_appearances_path attach_file(:appearance_header_logo, logo_fixture) @@ -129,7 +138,8 @@ RSpec.describe 'Admin Appearance' do end it 'Favicon' do - sign_in(create(:admin)) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) visit admin_appearances_path attach_file(:appearance_favicon, logo_fixture) diff --git a/spec/features/admin/admin_broadcast_messages_spec.rb b/spec/features/admin/admin_broadcast_messages_spec.rb index 091ed0a3396..586785272ae 100644 --- a/spec/features/admin/admin_broadcast_messages_spec.rb +++ b/spec/features/admin/admin_broadcast_messages_spec.rb @@ -4,7 +4,9 @@ require 'spec_helper' RSpec.describe 'Admin Broadcast Messages' do before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) create(:broadcast_message, :expired, message: 'Migration to new server') visit admin_broadcast_messages_path end diff --git a/spec/features/admin/admin_browse_spam_logs_spec.rb b/spec/features/admin/admin_browse_spam_logs_spec.rb index 65847876c11..9f63c8b5223 100644 --- a/spec/features/admin/admin_browse_spam_logs_spec.rb +++ b/spec/features/admin/admin_browse_spam_logs_spec.rb @@ -6,7 +6,9 @@ RSpec.describe 'Admin browse spam logs' do let!(:spam_log) { create(:spam_log, description: 'abcde ' * 20) } before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end it 'Browse spam logs' do diff --git a/spec/features/admin/admin_builds_spec.rb b/spec/features/admin/admin_builds_spec.rb index 166fde0f37a..42827dd5b49 100644 --- a/spec/features/admin/admin_builds_spec.rb +++ b/spec/features/admin/admin_builds_spec.rb @@ -4,7 +4,9 @@ require 'spec_helper' RSpec.describe 'Admin Builds' do before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end describe 'GET /admin/builds' do diff --git a/spec/features/admin/admin_cohorts_spec.rb b/spec/features/admin/admin_cohorts_spec.rb index f91446ed222..982a9333275 100644 --- a/spec/features/admin/admin_cohorts_spec.rb +++ b/spec/features/admin/admin_cohorts_spec.rb @@ -4,7 +4,9 @@ require 'spec_helper' RSpec.describe 'Cohorts page' do before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end context 'with usage ping enabled' do diff --git a/spec/features/admin/admin_deploy_keys_spec.rb b/spec/features/admin/admin_deploy_keys_spec.rb index 2039a6ff1ee..c326d0fd741 100644 --- a/spec/features/admin/admin_deploy_keys_spec.rb +++ b/spec/features/admin/admin_deploy_keys_spec.rb @@ -7,7 +7,9 @@ RSpec.describe 'admin deploy keys' do let!(:another_deploy_key) { create(:another_deploy_key, public: true) } before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end it 'show all public deploy keys' do diff --git a/spec/features/admin/admin_dev_ops_report_spec.rb b/spec/features/admin/admin_dev_ops_report_spec.rb index 3b2c9d75870..a05fa0640d8 100644 --- a/spec/features/admin/admin_dev_ops_report_spec.rb +++ b/spec/features/admin/admin_dev_ops_report_spec.rb @@ -4,7 +4,9 @@ require 'spec_helper' RSpec.describe 'DevOps Report page', :js do before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end context 'with devops_adoption feature flag disabled' do diff --git a/spec/features/admin/admin_disables_git_access_protocol_spec.rb b/spec/features/admin/admin_disables_git_access_protocol_spec.rb index d7feb21a8b3..f7f0592a315 100644 --- a/spec/features/admin/admin_disables_git_access_protocol_spec.rb +++ b/spec/features/admin/admin_disables_git_access_protocol_spec.rb @@ -12,6 +12,7 @@ RSpec.describe 'Admin disables Git access protocol', :js do before do stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end context 'with HTTP disabled' do diff --git a/spec/features/admin/admin_disables_two_factor_spec.rb b/spec/features/admin/admin_disables_two_factor_spec.rb index 216c8ae36c7..1f34c4ed17c 100644 --- a/spec/features/admin/admin_disables_two_factor_spec.rb +++ b/spec/features/admin/admin_disables_two_factor_spec.rb @@ -4,7 +4,9 @@ require 'spec_helper' RSpec.describe 'Admin disables 2FA for a user' do it 'successfully', :js do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) user = create(:user, :two_factor) edit_user(user) @@ -19,7 +21,9 @@ RSpec.describe 'Admin disables 2FA for a user' do end it 'for a user without 2FA enabled' do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) user = create(:user) edit_user(user) diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb index 96709cf8a12..c05e90d145e 100644 --- a/spec/features/admin/admin_groups_spec.rb +++ b/spec/features/admin/admin_groups_spec.rb @@ -13,6 +13,7 @@ RSpec.describe 'Admin Groups' do before do sign_in(current_user) + gitlab_enable_admin_mode_sign_in(current_user) stub_application_setting(default_group_visibility: internal) end diff --git a/spec/features/admin/admin_health_check_spec.rb b/spec/features/admin/admin_health_check_spec.rb index dfc7f5f6f84..0f6cba6c105 100644 --- a/spec/features/admin/admin_health_check_spec.rb +++ b/spec/features/admin/admin_health_check_spec.rb @@ -9,6 +9,7 @@ RSpec.describe "Admin Health Check", :feature do before do stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end describe '#show' do diff --git a/spec/features/admin/admin_hook_logs_spec.rb b/spec/features/admin/admin_hook_logs_spec.rb index f4a70621cee..3f63bf9a15c 100644 --- a/spec/features/admin/admin_hook_logs_spec.rb +++ b/spec/features/admin/admin_hook_logs_spec.rb @@ -8,7 +8,9 @@ RSpec.describe 'Admin::HookLogs' do let(:hook_log) { create(:web_hook_log, web_hook: system_hook, internal_error_message: 'some error') } before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end it 'show list of hook logs' do diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb index 1c14d65a1cd..3fed402267c 100644 --- a/spec/features/admin/admin_hooks_spec.rb +++ b/spec/features/admin/admin_hooks_spec.rb @@ -7,6 +7,7 @@ RSpec.describe 'Admin::Hooks' do before do sign_in(user) + gitlab_enable_admin_mode_sign_in(user) end describe 'GET /admin/hooks' do diff --git a/spec/features/admin/admin_labels_spec.rb b/spec/features/admin/admin_labels_spec.rb index 35638e0829b..815a73b1450 100644 --- a/spec/features/admin/admin_labels_spec.rb +++ b/spec/features/admin/admin_labels_spec.rb @@ -7,7 +7,9 @@ RSpec.describe 'admin issues labels' do let!(:feature_label) { Label.create(title: 'feature', template: true) } before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end describe 'list' do diff --git a/spec/features/admin/admin_manage_applications_spec.rb b/spec/features/admin/admin_manage_applications_spec.rb index 7a9a6f2ccb8..e54837ede11 100644 --- a/spec/features/admin/admin_manage_applications_spec.rb +++ b/spec/features/admin/admin_manage_applications_spec.rb @@ -4,7 +4,9 @@ require 'spec_helper' RSpec.describe 'admin manage applications' do before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end it 'creates new oauth application' do diff --git a/spec/features/admin/admin_mode/login_spec.rb b/spec/features/admin/admin_mode/login_spec.rb index 7cbba9ec674..f1dee075925 100644 --- a/spec/features/admin/admin_mode/login_spec.rb +++ b/spec/features/admin/admin_mode/login_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Admin Mode Login', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do +RSpec.describe 'Admin Mode Login' do include TermsHelper include UserLoginHelper include LdapHelpers diff --git a/spec/features/admin/admin_mode/logout_spec.rb b/spec/features/admin/admin_mode/logout_spec.rb index b4d49fe760f..b7fa59bbfb7 100644 --- a/spec/features/admin/admin_mode/logout_spec.rb +++ b/spec/features/admin/admin_mode/logout_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Admin Mode Logout', :js, :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do +RSpec.describe 'Admin Mode Logout', :js do include TermsHelper include UserLoginHelper diff --git a/spec/features/admin/admin_mode/workers_spec.rb b/spec/features/admin/admin_mode/workers_spec.rb index d037f5555dc..fbbcf19063b 100644 --- a/spec/features/admin/admin_mode/workers_spec.rb +++ b/spec/features/admin/admin_mode/workers_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' # Test an operation that triggers background jobs requiring administrative rights -RSpec.describe 'Admin mode for workers', :do_not_mock_admin_mode, :request_store, :clean_gitlab_redis_shared_state do +RSpec.describe 'Admin mode for workers', :request_store do let(:user) { create(:user) } let(:user_to_delete) { create(:user) } diff --git a/spec/features/admin/admin_mode_spec.rb b/spec/features/admin/admin_mode_spec.rb index 3b4edbc1a07..8169b3a20db 100644 --- a/spec/features/admin/admin_mode_spec.rb +++ b/spec/features/admin/admin_mode_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Admin mode', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do +RSpec.describe 'Admin mode' do include MobileHelpers include StubENV diff --git a/spec/features/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb index 522da760062..ff4e592234b 100644 --- a/spec/features/admin/admin_projects_spec.rb +++ b/spec/features/admin/admin_projects_spec.rb @@ -11,6 +11,7 @@ RSpec.describe "Admin::Projects" do before do sign_in(current_user) + gitlab_enable_admin_mode_sign_in(current_user) end describe "GET /admin/projects" do diff --git a/spec/features/admin/admin_requests_profiles_spec.rb b/spec/features/admin/admin_requests_profiles_spec.rb index c649fdd8e19..e92528d431d 100644 --- a/spec/features/admin/admin_requests_profiles_spec.rb +++ b/spec/features/admin/admin_requests_profiles_spec.rb @@ -7,7 +7,9 @@ RSpec.describe 'Admin::RequestsProfilesController' do before do stub_const('Gitlab::RequestProfiler::PROFILES_DIR', tmpdir) - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end after do diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb index 0e20ccf6bec..e16cde3fa1c 100644 --- a/spec/features/admin/admin_runners_spec.rb +++ b/spec/features/admin/admin_runners_spec.rb @@ -9,7 +9,9 @@ RSpec.describe "Admin Runners" do before do stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end describe "Runners page" do @@ -282,6 +284,12 @@ RSpec.describe "Admin Runners" do visit admin_runner_path(runner) end + describe 'runner page breadcrumbs' do + it 'contains the current runner’s short sha' do + expect(page.find('h2')).to have_content(runner.short_sha) + end + end + describe 'projects' do it 'contains project names' do expect(page).to have_content(@project1.full_name) diff --git a/spec/features/admin/admin_sees_project_statistics_spec.rb b/spec/features/admin/admin_sees_project_statistics_spec.rb index d94889b825a..be781730924 100644 --- a/spec/features/admin/admin_sees_project_statistics_spec.rb +++ b/spec/features/admin/admin_sees_project_statistics_spec.rb @@ -7,6 +7,7 @@ RSpec.describe "Admin > Admin sees project statistics" do before do sign_in(current_user) + gitlab_enable_admin_mode_sign_in(current_user) visit admin_project_path(project) end @@ -15,7 +16,7 @@ RSpec.describe "Admin > Admin sees project statistics" do let(:project) { create(:project, :repository) } it "shows project statistics" do - expect(page).to have_content("Storage: 0 Bytes (Repository: 0 Bytes / Wikis: 0 Bytes / Build Artifacts: 0 Bytes / LFS: 0 Bytes / Snippets: 0 Bytes)") + expect(page).to have_content("Storage: 0 Bytes (Repository: 0 Bytes / Wikis: 0 Bytes / Build Artifacts: 0 Bytes / LFS: 0 Bytes / Snippets: 0 Bytes / Packages: 0 Bytes / Uploads: 0 Bytes)") end end diff --git a/spec/features/admin/admin_sees_projects_statistics_spec.rb b/spec/features/admin/admin_sees_projects_statistics_spec.rb index 786fa98255c..2e96814d1e9 100644 --- a/spec/features/admin/admin_sees_projects_statistics_spec.rb +++ b/spec/features/admin/admin_sees_projects_statistics_spec.rb @@ -10,6 +10,7 @@ RSpec.describe "Admin > Admin sees projects statistics" do create(:project, :repository) { |project| project.statistics.destroy } sign_in(current_user) + gitlab_enable_admin_mode_sign_in(current_user) visit admin_projects_path end diff --git a/spec/features/admin/admin_serverless_domains_spec.rb b/spec/features/admin/admin_serverless_domains_spec.rb index 256887f425f..fc84df91854 100644 --- a/spec/features/admin/admin_serverless_domains_spec.rb +++ b/spec/features/admin/admin_serverless_domains_spec.rb @@ -7,7 +7,9 @@ RSpec.describe 'Admin Serverless Domains', :js do before do allow(Gitlab.config.pages).to receive(:enabled).and_return(true) - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end it 'Add domain with certificate' do diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 8929abc7edc..9d1e71092ae 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do +RSpec.describe 'Admin updates settings' do include StubENV include TermsHelper include UsageDataHelpers diff --git a/spec/features/admin/admin_system_info_spec.rb b/spec/features/admin/admin_system_info_spec.rb index 6a0448fd890..2225f25aa1e 100644 --- a/spec/features/admin/admin_system_info_spec.rb +++ b/spec/features/admin/admin_system_info_spec.rb @@ -4,7 +4,9 @@ require 'spec_helper' RSpec.describe 'Admin System Info' do before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end describe 'GET /admin/system_info' do diff --git a/spec/features/admin/admin_users_impersonation_tokens_spec.rb b/spec/features/admin/admin_users_impersonation_tokens_spec.rb index ec3dd322f97..cae190e76b0 100644 --- a/spec/features/admin/admin_users_impersonation_tokens_spec.rb +++ b/spec/features/admin/admin_users_impersonation_tokens_spec.rb @@ -20,6 +20,7 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do before do sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end describe "token creation" do diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index 97a30143a59..8809d04e6ec 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -13,6 +13,7 @@ RSpec.describe "Admin::Users" do before do sign_in(current_user) + gitlab_enable_admin_mode_sign_in(current_user) end describe "GET /admin/users" do @@ -205,8 +206,8 @@ RSpec.describe "Admin::Users" do end end - context 'when blocking a user' do - it 'shows confirmation and allows blocking', :js do + context 'when blocking/unblocking a user' do + it 'shows confirmation and allows blocking and unblocking', :js do expect(page).to have_content(user.email) find("[data-testid='user-action-button-#{user.id}']").click @@ -228,6 +229,30 @@ RSpec.describe "Admin::Users" do expect(page).to have_content('Successfully blocked') expect(page).not_to have_content(user.email) + + click_link 'Blocked' + + wait_for_requests + + expect(page).to have_content(user.email) + + find("[data-testid='user-action-button-#{user.id}']").click + + within find("[data-testid='user-action-dropdown-#{user.id}']") do + find('li button', text: 'Unblock').click + end + + wait_for_requests + + expect(page).to have_content('Unblock user') + expect(page).to have_content('You can always block their account again if needed.') + + find('.modal-footer button', text: 'Unblock').click + + wait_for_requests + + expect(page).to have_content('Successfully unblocked') + expect(page).not_to have_content(user.email) end end end @@ -388,8 +413,8 @@ RSpec.describe "Admin::Users" do end end - context 'when blocking the user' do - it 'shows confirmation and allows blocking', :js do + context 'when blocking/unblocking the user' do + it 'shows confirmation and allows blocking and unblocking', :js do visit admin_user_path(user) find('button', text: 'Block user').click @@ -405,6 +430,20 @@ RSpec.describe "Admin::Users" do expect(page).to have_content('Successfully blocked') expect(page).to have_content('This user is blocked') + + find('button', text: 'Unblock user').click + + wait_for_requests + + expect(page).to have_content('Unblock user') + expect(page).to have_content('You can always block their account again if needed.') + + find('.modal-footer button', text: 'Unblock').click + + wait_for_requests + + expect(page).to have_content('Successfully unblocked') + expect(page).to have_content('Block this user') end end diff --git a/spec/features/admin/admin_uses_repository_checks_spec.rb b/spec/features/admin/admin_uses_repository_checks_spec.rb index 0fb5124f673..0e448446085 100644 --- a/spec/features/admin/admin_uses_repository_checks_spec.rb +++ b/spec/features/admin/admin_uses_repository_checks_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Admin uses repository checks', :request_store, :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do +RSpec.describe 'Admin uses repository checks', :request_store do include StubENV let(:admin) { create(:admin) } diff --git a/spec/features/admin/clusters/applications_spec.rb b/spec/features/admin/clusters/applications_spec.rb index 3bcadfdbfc1..e083e4fee4c 100644 --- a/spec/features/admin/clusters/applications_spec.rb +++ b/spec/features/admin/clusters/applications_spec.rb @@ -10,6 +10,7 @@ RSpec.describe 'Instance-level Cluster Applications', :js do before do sign_in(user) + gitlab_enable_admin_mode_sign_in(user) end describe 'Installing applications' do diff --git a/spec/features/admin/clusters/eks_spec.rb b/spec/features/admin/clusters/eks_spec.rb index ad7122bf182..a1bac720349 100644 --- a/spec/features/admin/clusters/eks_spec.rb +++ b/spec/features/admin/clusters/eks_spec.rb @@ -7,6 +7,7 @@ RSpec.describe 'Instance-level AWS EKS Cluster', :js do before do sign_in(user) + gitlab_enable_admin_mode_sign_in(user) end context 'when user does not have a cluster and visits group clusters page' do diff --git a/spec/features/admin/dashboard_spec.rb b/spec/features/admin/dashboard_spec.rb index acb8fb54e11..c040811ada1 100644 --- a/spec/features/admin/dashboard_spec.rb +++ b/spec/features/admin/dashboard_spec.rb @@ -6,7 +6,9 @@ RSpec.describe 'admin visits dashboard' do include ProjectForksHelper before do - sign_in(create(:admin)) + admin = create(:admin) + sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) end context 'counting forks', :js do diff --git a/spec/features/admin/services/admin_activates_prometheus_spec.rb b/spec/features/admin/services/admin_activates_prometheus_spec.rb index 199eae59afc..a225de365c8 100644 --- a/spec/features/admin/services/admin_activates_prometheus_spec.rb +++ b/spec/features/admin/services/admin_activates_prometheus_spec.rb @@ -7,6 +7,7 @@ RSpec.describe 'Admin activates Prometheus', :js do before do sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) visit(admin_application_settings_services_path) diff --git a/spec/features/admin/services/admin_visits_service_templates_spec.rb b/spec/features/admin/services/admin_visits_service_templates_spec.rb index a37e57304aa..563bca8b32f 100644 --- a/spec/features/admin/services/admin_visits_service_templates_spec.rb +++ b/spec/features/admin/services/admin_visits_service_templates_spec.rb @@ -8,6 +8,7 @@ RSpec.describe 'Admin visits service templates' do before do sign_in(admin) + gitlab_enable_admin_mode_sign_in(admin) visit(admin_application_settings_services_path) end |