diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-07 06:07:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-07 06:07:43 +0300 |
commit | dc87c6514746996c8d720527c10102d42809804b (patch) | |
tree | 7a2b99f7237c674da2176d5d297daf1af6d9b89f /spec/initializers/direct_upload_support_spec.rb | |
parent | 4e375367b78bb44bd00957522cd9fc3e6d403fef (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers/direct_upload_support_spec.rb')
-rw-r--r-- | spec/initializers/direct_upload_support_spec.rb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/spec/initializers/direct_upload_support_spec.rb b/spec/initializers/direct_upload_support_spec.rb index 4b3fe871cef..7db40f4b5ab 100644 --- a/spec/initializers/direct_upload_support_spec.rb +++ b/spec/initializers/direct_upload_support_spec.rb @@ -56,7 +56,7 @@ describe 'Direct upload support' do let(:connection) { nil } it 'raises an error' do - expect { subject }.to raise_error /are supported as a object storage provider when 'direct_upload' is used/ + expect { subject }.to raise_error "No provider configured for '#{config_name}'. Only Google, AWS are supported." end end @@ -64,7 +64,20 @@ describe 'Direct upload support' do let(:provider) { 'Rackspace' } it 'raises an error' do - expect { subject }.to raise_error /are supported as a object storage provider when 'direct_upload' is used/ + expect { subject }.to raise_error /Object storage provider '#{provider}' is not supported when 'direct_upload' is used for '#{config_name}'/ + end + end + + context 'when connection is omitted' do + let(:object_store) do + { + enabled: enabled, + direct_upload: direct_upload + } + end + + it 'raises an error' do + expect { subject }.to raise_error /the 'connection' section is missing/ end end end |