diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/services/application_settings | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/services/application_settings')
-rw-r--r-- | spec/services/application_settings/update_service_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/services/application_settings/update_service_spec.rb b/spec/services/application_settings/update_service_spec.rb index e5060fa2eeb..03e55b3ec46 100644 --- a/spec/services/application_settings/update_service_spec.rb +++ b/spec/services/application_settings/update_service_spec.rb @@ -66,7 +66,7 @@ RSpec.describe ApplicationSettings::UpdateService do context 'when params is blank' do let(:params) { {} } - it 'does not add to whitelist' do + it 'does not add to allowlist' do expect { subject.execute }.not_to change { application_settings.outbound_local_requests_whitelist } @@ -80,7 +80,7 @@ RSpec.describe ApplicationSettings::UpdateService do let(:params) { { add_to_outbound_local_requests_whitelist: ['example.com', ''] } } - it 'adds to whitelist' do + it 'adds to allowlist' do expect { subject.execute }.to change { application_settings.outbound_local_requests_whitelist } @@ -91,14 +91,14 @@ RSpec.describe ApplicationSettings::UpdateService do end end - context 'when param outbound_local_requests_whitelist_raw is passed' do + context 'when param outbound_local_requests_allowlist_raw is passed' do before do application_settings.outbound_local_requests_whitelist = ['127.0.0.1'] end - let(:params) { { outbound_local_requests_whitelist_raw: 'example.com;gitlab.com' } } + let(:params) { { outbound_local_requests_allowlist_raw: 'example.com;gitlab.com' } } - it 'overwrites the existing whitelist' do + it 'overwrites the existing allowlist' do expect { subject.execute }.to change { application_settings.outbound_local_requests_whitelist } |