diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/lib/object_storage | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/lib/object_storage')
-rw-r--r-- | spec/lib/object_storage/direct_upload_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/lib/object_storage/direct_upload_spec.rb b/spec/lib/object_storage/direct_upload_spec.rb index 12c6cbe03b3..4b374452c0a 100644 --- a/spec/lib/object_storage/direct_upload_spec.rb +++ b/spec/lib/object_storage/direct_upload_spec.rb @@ -126,6 +126,16 @@ RSpec.describe ObjectStorage::DirectUpload do expect(s3_config.keys).not_to include(%i(ServerSideEncryption SSEKMSKeyID)) end + context 'when no region is specified' do + before do + raw_config.delete(:region) + end + + it 'defaults to us-east-1' do + expect(subject[:ObjectStorage][:S3Config][:Region]).to eq('us-east-1') + end + end + context 'when feature flag is disabled' do before do stub_feature_flags(use_workhorse_s3_client: false) |