diff options
Diffstat (limited to 'spec/controllers/admin')
-rw-r--r-- | spec/controllers/admin/application_settings_controller_spec.rb | 15 | ||||
-rw-r--r-- | spec/controllers/admin/integrations_controller_spec.rb | 10 |
2 files changed, 2 insertions, 23 deletions
diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb index 6ae9dc38016..4f223811be8 100644 --- a/spec/controllers/admin/application_settings_controller_spec.rb +++ b/spec/controllers/admin/application_settings_controller_spec.rb @@ -142,23 +142,12 @@ RSpec.describe Admin::ApplicationSettingsController do end describe 'verify panel actions' do - before do - stub_feature_flags(instance_level_integrations: false) - end - Admin::ApplicationSettingsController::VALID_SETTING_PANELS.each do |valid_action| it_behaves_like 'renders correct panels' do let(:action) { valid_action } end end end - end - - describe 'PATCH #integrations' do - before do - stub_feature_flags(instance_level_integrations: false) - sign_in(admin) - end describe 'EKS integration' do let(:application_setting) { ApplicationSetting.current } @@ -172,7 +161,7 @@ RSpec.describe Admin::ApplicationSettingsController do end it 'updates EKS settings' do - patch :integrations, params: { application_setting: settings_params } + put :update, params: { application_setting: settings_params } expect(application_setting.eks_integration_enabled).to be_truthy expect(application_setting.eks_account_id).to eq '123456789012' @@ -186,7 +175,7 @@ RSpec.describe Admin::ApplicationSettingsController do it 'does not update the secret key' do application_setting.update!(eks_secret_access_key: 'dummy secret key') - patch :integrations, params: { application_setting: settings_params } + put :update, params: { application_setting: settings_params } expect(application_setting.reload.eks_secret_access_key).to eq 'dummy secret key' end diff --git a/spec/controllers/admin/integrations_controller_spec.rb b/spec/controllers/admin/integrations_controller_spec.rb index 7e7b60db2dc..4a5d5ede728 100644 --- a/spec/controllers/admin/integrations_controller_spec.rb +++ b/spec/controllers/admin/integrations_controller_spec.rb @@ -10,16 +10,6 @@ RSpec.describe Admin::IntegrationsController do end describe '#edit' do - context 'when instance_level_integrations not enabled' do - it 'returns not_found' do - stub_feature_flags(instance_level_integrations: false) - - get :edit, params: { id: Service.available_services_names.sample } - - expect(response).to have_gitlab_http_status(:not_found) - end - end - Service.available_services_names.each do |integration_name| context "#{integration_name}" do it 'successfully displays the template' do |