summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-26 14:25:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-26 14:25:05 +0000
commitdf400447bfd5c650b32cc8d75fa80f8cc7099d94 (patch)
treea8cff21170078eb41d3fd08991c745dd7c86b176 /spec/controllers
parented15b5061242cb70b2e11c3d08c727e07aa932a8 (diff)
downloadgitlab-ce-df400447bfd5c650b32cc8d75fa80f8cc7099d94.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-0-stable-ee
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/admin/application_settings_controller_spec.rb40
1 files changed, 40 insertions, 0 deletions
diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb
index 33764818f79..fe28e791ade 100644
--- a/spec/controllers/admin/application_settings_controller_spec.rb
+++ b/spec/controllers/admin/application_settings_controller_spec.rb
@@ -155,6 +155,46 @@ describe Admin::ApplicationSettingsController do
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 }
+ let(:settings_params) do
+ {
+ eks_integration_enabled: '1',
+ eks_account_id: '123456789012',
+ eks_access_key_id: 'dummy access key',
+ eks_secret_access_key: 'dummy secret key'
+ }
+ end
+
+ it 'updates EKS settings' do
+ patch :integrations, params: { application_setting: settings_params }
+
+ expect(application_setting.eks_integration_enabled).to be_truthy
+ expect(application_setting.eks_account_id).to eq '123456789012'
+ expect(application_setting.eks_access_key_id).to eq 'dummy access key'
+ expect(application_setting.eks_secret_access_key).to eq 'dummy secret key'
+ end
+
+ context 'secret access key is blank' do
+ let(:settings_params) { { eks_secret_access_key: '' } }
+
+ 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 }
+
+ expect(application_setting.reload.eks_secret_access_key).to eq 'dummy secret key'
+ end
+ end
+ end
+ end
+
describe 'PUT #reset_registration_token' do
before do
sign_in(admin)