diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /spec/config | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'spec/config')
-rw-r--r-- | spec/config/object_store_settings_spec.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb index 36938c74afa..430ba1205cb 100644 --- a/spec/config/object_store_settings_spec.rb +++ b/spec/config/object_store_settings_spec.rb @@ -24,6 +24,7 @@ RSpec.describe ObjectStoreSettings do 'lfs' => { 'enabled' => true }, 'artifacts' => { 'enabled' => true }, 'external_diffs' => { 'enabled' => false }, + 'pages' => { 'enabled' => true }, 'object_store' => { 'enabled' => true, 'connection' => connection, @@ -39,6 +40,9 @@ RSpec.describe ObjectStoreSettings do 'external_diffs' => { 'bucket' => 'external_diffs', 'enabled' => false + }, + 'pages' => { + 'bucket' => 'pages' } } } @@ -64,6 +68,11 @@ RSpec.describe ObjectStoreSettings do expect(settings.lfs['object_store']['proxy_download']).to be true expect(settings.lfs['object_store']['remote_directory']).to eq('lfs-objects') + expect(settings.pages['enabled']).to be true + expect(settings.pages['object_store']['enabled']).to be true + expect(settings.pages['object_store']['connection']).to eq(connection) + expect(settings.pages['object_store']['remote_directory']).to eq('pages') + expect(settings.external_diffs['enabled']).to be false expect(settings.external_diffs['object_store']['enabled']).to be false expect(settings.external_diffs['object_store']['remote_directory']).to eq('external_diffs') @@ -75,6 +84,12 @@ RSpec.describe ObjectStoreSettings do expect { subject }.to raise_error(/Object storage for lfs must have a bucket specified/) end + it 'does not raise error if pages bucket is missing' do + config['object_store']['objects']['pages'].delete('bucket') + + expect { subject }.not_to raise_error + end + context 'with legacy config' do let(:legacy_settings) do { |