diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 15:21:10 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 15:21:10 +0000 |
commit | e33f87ac0fabaab468ce4b457996cc0f1b1bb648 (patch) | |
tree | 8bf0de72a9acac014cfdaddab7d463b208294af2 /spec/config | |
parent | 5baf990db20a75078684702782c24399ef9eb0fa (diff) | |
download | gitlab-ce-e33f87ac0fabaab468ce4b457996cc0f1b1bb648.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/config')
-rw-r--r-- | spec/config/smime_signature_settings_spec.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/config/smime_signature_settings_spec.rb b/spec/config/smime_signature_settings_spec.rb index 4f076a92b16..7e7b42b129a 100644 --- a/spec/config/smime_signature_settings_spec.rb +++ b/spec/config/smime_signature_settings_spec.rb @@ -6,6 +6,7 @@ describe SmimeSignatureSettings do describe '.parse' do let(:default_smime_key) { Rails.root.join('.gitlab_smime_key') } let(:default_smime_cert) { Rails.root.join('.gitlab_smime_cert') } + let(:default_smime_ca_certs) { nil } it 'sets correct default values to disabled' do parsed_settings = described_class.parse(nil) @@ -13,6 +14,7 @@ describe SmimeSignatureSettings do expect(parsed_settings['enabled']).to be(false) expect(parsed_settings['key_file']).to eq(default_smime_key) expect(parsed_settings['cert_file']).to eq(default_smime_cert) + expect(parsed_settings['ca_certs_file']).to eq(default_smime_ca_certs) end context 'when providing custom values' do @@ -24,6 +26,7 @@ describe SmimeSignatureSettings do expect(parsed_settings['enabled']).to be(false) expect(parsed_settings['key_file']).to eq(default_smime_key) expect(parsed_settings['cert_file']).to eq(default_smime_cert) + expect(parsed_settings['ca_certs_file']).to eq(default_smime_ca_certs) end it 'enables smime with default key and cert' do @@ -36,15 +39,18 @@ describe SmimeSignatureSettings do expect(parsed_settings['enabled']).to be(true) expect(parsed_settings['key_file']).to eq(default_smime_key) expect(parsed_settings['cert_file']).to eq(default_smime_cert) + expect(parsed_settings['ca_certs_file']).to eq(default_smime_ca_certs) end it 'enables smime with custom key and cert' do custom_key = '/custom/key' custom_cert = '/custom/cert' + custom_ca_certs = '/custom/ca_certs' custom_settings = Settingslogic.new({ 'enabled' => true, 'key_file' => custom_key, - 'cert_file' => custom_cert + 'cert_file' => custom_cert, + 'ca_certs_file' => custom_ca_certs }) parsed_settings = described_class.parse(custom_settings) @@ -52,6 +58,7 @@ describe SmimeSignatureSettings do expect(parsed_settings['enabled']).to be(true) expect(parsed_settings['key_file']).to eq(custom_key) expect(parsed_settings['cert_file']).to eq(custom_cert) + expect(parsed_settings['ca_certs_file']).to eq(custom_ca_certs) end end end |