From 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 19 May 2021 15:44:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-12-stable-ee --- spec/lib/object_storage/direct_upload_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'spec/lib/object_storage') 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) -- cgit v1.2.3