diff options
author | Brett Walker <bwalker@gitlab.com> | 2019-09-05 09:13:38 -0500 |
---|---|---|
committer | Brett Walker <bwalker@gitlab.com> | 2019-09-05 09:36:02 -0500 |
commit | 921c704f0084739fb0e20e94f8572b6e1841175c (patch) | |
tree | cdecb6ce06a0e25959664c4b26130d2ffdb2e1a0 /spec/lib/banzai | |
parent | 700bdfc77d503df28f4097c56bfc7ea9f1396e88 (diff) | |
download | gitlab-ce-921c704f0084739fb0e20e94f8572b6e1841175c.tar.gz |
Set asset_proxy_whitelist default to gitlab host67037-user-content-gitlab-static-net-brings-back-404-only
Diffstat (limited to 'spec/lib/banzai')
-rw-r--r-- | spec/lib/banzai/filter/asset_proxy_filter_spec.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/spec/lib/banzai/filter/asset_proxy_filter_spec.rb b/spec/lib/banzai/filter/asset_proxy_filter_spec.rb index b7f45421b2a..0c4ccbf28f4 100644 --- a/spec/lib/banzai/filter/asset_proxy_filter_spec.rb +++ b/spec/lib/banzai/filter/asset_proxy_filter_spec.rb @@ -36,6 +36,17 @@ describe Banzai::Filter::AssetProxyFilter do expect(Gitlab.config.asset_proxy.whitelist).to eq %w(gitlab.com *.mydomain.com) expect(Gitlab.config.asset_proxy.domain_regexp).to eq /^(gitlab\.com|.*?\.mydomain\.com)$/i end + + context 'when whitelist is empty' do + it 'defaults to the install domain' do + stub_application_setting(asset_proxy_enabled: true) + stub_application_setting(asset_proxy_whitelist: []) + + described_class.initialize_settings + + expect(Gitlab.config.asset_proxy.whitelist).to eq [Gitlab.config.gitlab.host] + end + end end context 'when properly configured' do |