diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-25 03:08:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-25 03:08:59 +0300 |
commit | 4f749a9b30a638f0bd3a19e8d9925e966b0f5cb4 (patch) | |
tree | b786e4d09b23ff9c89c7c429fa21fa74068d17fb /spec/features/admin | |
parent | 167894d0e7c98aae1c6d4f5a060ad6d58ea3f382 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/admin')
-rw-r--r-- | spec/features/admin/admin_mode_spec.rb | 173 | ||||
-rw-r--r-- | spec/features/admin/admin_settings_spec.rb | 102 |
2 files changed, 173 insertions, 102 deletions
diff --git a/spec/features/admin/admin_mode_spec.rb b/spec/features/admin/admin_mode_spec.rb new file mode 100644 index 00000000000..016147e6508 --- /dev/null +++ b/spec/features/admin/admin_mode_spec.rb @@ -0,0 +1,173 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'Admin mode', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do + include MobileHelpers + include StubENV + + let(:admin) { create(:admin) } + + before do + stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') + end + + context 'feature flag :user_mode_in_session is enabled', :request_store do + before do + sign_in(admin) + end + + context 'when not in admin mode' do + it 'has no leave admin mode button' do + visit new_admin_session_path + + page.within('.navbar-sub-nav') do + expect(page).not_to have_link(href: destroy_admin_session_path) + end + end + + it 'can open pages not in admin scope' do + visit new_admin_session_path + + page.within('.navbar-sub-nav') do + find_all('a', text: 'Projects').first.click + end + + expect(page).to have_current_path(dashboard_projects_path) + end + + it 'is necessary to provide credentials again before opening pages in admin scope' do + visit admin_application_settings_path # admin logged out because not in admin_mode + + expect(page).to have_current_path(new_admin_session_path) + end + + it 'can enter admin mode' do + visit new_admin_session_path + + fill_in 'password', with: admin.password + + click_button 'Enter Admin Mode' + + expect(page).to have_current_path(admin_root_path) + end + + context 'on a read-only instance' do + before do + allow(Gitlab::Database).to receive(:read_only?).and_return(true) + end + + it 'can enter admin mode' do + visit new_admin_session_path + + fill_in 'password', with: admin.password + + click_button 'Enter Admin Mode' + + expect(page).to have_current_path(admin_root_path) + end + end + end + + context 'when in admin_mode' do + before do + gitlab_enable_admin_mode_sign_in(admin) + end + + it 'contains link to leave admin mode' do + page.within('.navbar-sub-nav') do + expect(page).to have_link(href: destroy_admin_session_path) + end + end + + it 'can leave admin mode using main dashboard link', :js do + page.within('.navbar-sub-nav') do + click_on 'Leave Admin Mode' + + expect(page).to have_link(href: new_admin_session_path) + end + end + + it 'can leave admin mode using dropdown menu on smaller screens', :js do + resize_screen_xs + visit root_dashboard_path + + find('.header-more').click + + page.within '.navbar-sub-nav' do + click_on 'Leave Admin Mode' + + find('.header-more').click + + expect(page).to have_link(href: new_admin_session_path) + end + end + + it 'can open pages not in admin scope' do + page.within('.navbar-sub-nav') do + find_all('a', text: 'Projects').first.click + + expect(page).to have_current_path(dashboard_projects_path) + end + end + + context 'nav bar' do + it 'shows admin dashboard links on bigger screen' do + visit root_dashboard_path + + page.within '.navbar' do + expect(page).to have_link(text: 'Admin Area', href: admin_root_path, visible: true) + expect(page).to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true) + end + end + + it 'relocates admin dashboard links to dropdown list on smaller screen', :js do + resize_screen_xs + visit root_dashboard_path + + page.within '.navbar' do + expect(page).not_to have_link(text: 'Admin Area', href: admin_root_path, visible: true) + expect(page).not_to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true) + end + + find('.header-more').click + + page.within '.navbar' do + expect(page).to have_link(text: 'Admin Area', href: admin_root_path, visible: true) + expect(page).to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true) + end + end + end + + context 'on a read-only instance' do + before do + allow(Gitlab::Database).to receive(:read_only?).and_return(true) + end + + it 'can leave admin mode', :js do + page.within('.navbar-sub-nav') do + click_on 'Leave Admin Mode' + + expect(page).to have_link(href: new_admin_session_path) + end + end + end + end + end + + context 'feature flag :user_mode_in_session is disabled' do + before do + stub_feature_flags(user_mode_in_session: false) + sign_in(admin) + end + + it 'shows no admin mode buttons in navbar' do + visit admin_root_path + + page.within('.navbar-sub-nav') do + expect(page).not_to have_link(href: new_admin_session_path) + expect(page).not_to have_link(href: destroy_admin_session_path) + end + end + end +end diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 0168c2118c7..d0ed2c3210b 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -5,7 +5,6 @@ require 'spec_helper' describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_mock_admin_mode do include StubENV include TermsHelper - include MobileHelpers let(:admin) { create(:admin) } @@ -449,100 +448,6 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc expect(page).to have_link(text: 'Support', href: new_support_url) end end - - it 'Shows admin dashboard links on bigger screen' do - visit root_dashboard_path - - page.within '.navbar' do - expect(page).to have_link(text: 'Admin Area', href: admin_root_path, visible: true) - expect(page).to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true) - end - end - - it 'Relocates admin dashboard links to dropdown list on smaller screen', :js do - resize_screen_xs - visit root_dashboard_path - - page.within '.navbar' do - expect(page).not_to have_link(text: 'Admin Area', href: admin_root_path, visible: true) - expect(page).not_to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true) - end - - find('.header-more').click - - page.within '.navbar' do - expect(page).to have_link(text: 'Admin Area', href: admin_root_path, visible: true) - expect(page).to have_link(text: 'Leave Admin Mode', href: destroy_admin_session_path, visible: true) - end - end - end - - context 'when in admin_mode' do - it 'contains link to leave admin mode' do - page.within('.navbar-sub-nav') do - expect(page).to have_link(href: destroy_admin_session_path) - end - end - - it 'can leave admin mode using main dashboard link', :js do - page.within('.navbar-sub-nav') do - click_on 'Leave Admin Mode' - - expect(page).to have_link(href: new_admin_session_path) - end - end - - it 'can leave admin mode using dropdown menu on smaller screens', :js do - resize_screen_xs - visit root_dashboard_path - - find('.header-more').click - - page.within '.navbar-sub-nav' do - click_on 'Leave Admin Mode' - - find('.header-more').click - - expect(page).to have_link(href: new_admin_session_path) - end - end - - it 'can open pages not in admin scope' do - page.within('.navbar-sub-nav') do - find_all('a', text: 'Projects').first.click - - expect(page).to have_current_path(dashboard_projects_path) - end - end - end - - context 'when not in admin mode' do - before do - page.within('.navbar-sub-nav') do - # Select first, link is also included in mobile view list - click_on 'Leave Admin Mode', match: :first - end - end - - it 'has no leave admin mode button' do - page.within('.navbar-sub-nav') do - expect(page).not_to have_link(href: destroy_admin_session_path) - end - end - - it 'is necessary to provide credentials again before opening admin settings' do - visit admin_application_settings_path # admin logged out because not in admin_mode - - expect(page).to have_current_path(new_admin_session_path) - end - - it 'can open pages not in admin scope' do - page.within('.navbar-sub-nav') do - find_all('a', text: 'Projects').first.click - end - - expect(page).to have_current_path(dashboard_projects_path) - end end end @@ -559,13 +464,6 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc it 'loads admin settings page without redirect for reauthentication' do expect(current_path).to eq admin_application_settings_path end - - it 'shows no admin mode buttons in navbar' do - page.within('.navbar-sub-nav') do - expect(page).not_to have_link(href: new_admin_session_path) - expect(page).not_to have_link(href: destroy_admin_session_path) - end - end end def check_all_events |