diff options
Diffstat (limited to 'spec/lib/banzai/filter/asset_proxy_filter_spec.rb')
| -rw-r--r-- | spec/lib/banzai/filter/asset_proxy_filter_spec.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/spec/lib/banzai/filter/asset_proxy_filter_spec.rb b/spec/lib/banzai/filter/asset_proxy_filter_spec.rb index 1f886059bf6..81aa8d35ebc 100644 --- a/spec/lib/banzai/filter/asset_proxy_filter_spec.rb +++ b/spec/lib/banzai/filter/asset_proxy_filter_spec.rb @@ -28,7 +28,7 @@ RSpec.describe Banzai::Filter::AssetProxyFilter do stub_application_setting(asset_proxy_enabled: true) stub_application_setting(asset_proxy_secret_key: 'shared-secret') stub_application_setting(asset_proxy_url: 'https://assets.example.com') - stub_application_setting(asset_proxy_whitelist: %w(gitlab.com *.mydomain.com)) + stub_application_setting(asset_proxy_allowlist: %w(gitlab.com *.mydomain.com)) described_class.initialize_settings @@ -39,16 +39,26 @@ RSpec.describe Banzai::Filter::AssetProxyFilter do expect(Gitlab.config.asset_proxy.domain_regexp).to eq(/^(gitlab\.com|.*?\.mydomain\.com)$/i) end - context 'when whitelist is empty' do + context 'when allowlist is empty' do it 'defaults to the install domain' do stub_application_setting(asset_proxy_enabled: true) - stub_application_setting(asset_proxy_whitelist: []) + stub_application_setting(asset_proxy_allowlist: []) described_class.initialize_settings expect(Gitlab.config.asset_proxy.allowlist).to eq [Gitlab.config.gitlab.host] end end + + it 'supports deprecated whitelist settings' do + stub_application_setting(asset_proxy_enabled: true) + stub_application_setting(asset_proxy_whitelist: %w(foo.com bar.com)) + stub_application_setting(asset_proxy_allowlist: []) + + described_class.initialize_settings + + expect(Gitlab.config.asset_proxy.allowlist).to eq %w(foo.com bar.com) + end end context 'when properly configured' do |