diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-17 09:10:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-17 09:10:12 +0300 |
commit | c64b892786865a3b87701450c6ca62fcab0fa044 (patch) | |
tree | 81193337273f6360b9d0814064454248cf0a7b6a /spec/features | |
parent | d17008f99ed08e7c231b7e8e65cba1be51e2e747 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/admin/admin_settings_spec.rb | 3 | ||||
-rw-r--r-- | spec/features/projects/clusters/gcp_spec.rb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 55f6a9930ff..f5b05c76e90 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -209,8 +209,7 @@ RSpec.describe 'Admin updates settings', :clean_gitlab_redis_shared_state, :do_n context 'Integrations page' do before do - stub_feature_flags(instance_level_integrations: false) - visit integrations_admin_application_settings_path + visit general_admin_application_settings_path end it 'Enable hiding third party offers' do diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 2e6a366f77a..63e5546b43c 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -205,11 +205,10 @@ RSpec.describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do let(:admin) { create(:admin) } before do - stub_feature_flags(instance_level_integrations: false) stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') sign_in(admin) gitlab_enable_admin_mode_sign_in(admin) - visit integrations_admin_application_settings_path + visit general_admin_application_settings_path end it 'user does not see the offer' do |