diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 18:08:44 +0300 |
commit | 120f4aaedc8fe830a3f572491d240d8ee6addefb (patch) | |
tree | a2138baa55dfa67d292fb1a83ce686ee7f5d10a5 /spec/features/admin | |
parent | 729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/admin')
-rw-r--r-- | spec/features/admin/admin_settings_spec.rb | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 9b275a8897b..743aa0ed60e 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -194,12 +194,6 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc expect(page).to have_content "Application settings saved successfully" expect(current_settings.terminal_max_session_time).to eq(15) end - end - - context 'Integrations page' do - before do - visit integrations_admin_application_settings_path - end it 'Enable hiding third party offers' do page.within('.as-third-party-offers') do @@ -241,6 +235,25 @@ describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_not_moc end end + context 'Integration page', :js do + before do + visit integrations_admin_application_settings_path + end + + it 'allows user to dismiss deprecation notice' do + expect(page).to have_content('Some settings have moved') + + click_button 'Dismiss' + wait_for_requests + + expect(page).not_to have_content('Some settings have moved') + + visit integrations_admin_application_settings_path + + expect(page).not_to have_content('Some settings have moved') + end + end + context 'CI/CD page' do it 'Change CI/CD settings' do visit ci_cd_admin_application_settings_path |