Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 13 insertions, 9 deletions

diff --git a/spec/lib/object_storage/direct_upload_spec.rb b/spec/lib/object_storage/direct_upload_spec.rb
index b11926aeb49..932d579c3cc 100644
--- a/spec/lib/object_storage/direct_upload_spec.rb
+++ b/spec/lib/object_storage/direct_upload_spec.rb
@@ -211,7 +211,7 @@ RSpec.describe ObjectStorage::DirectUpload do
         expect(subject[:UseWorkhorseClient]).to be true
         expect(subject[:RemoteTempObjectID]).to eq(object_name)
         expect(subject[:ObjectStorage][:Provider]).to eq('AzureRM')
-        expect(subject[:ObjectStorage][:GoCloudConfig]).to eq({ URL: "azblob://#{bucket_name}" })
+        expect(subject[:ObjectStorage][:GoCloudConfig]).to eq({ URL: gocloud_url })
       end
     end
 
@@ -395,20 +395,24 @@ RSpec.describe ObjectStorage::DirectUpload do
         }
       end
 
+      let(:has_length) { false }
+      let(:storage_domain) { nil }
       let(:storage_url) { 'https://azuretest.blob.core.windows.net' }
+      let(:gocloud_url) { "azblob://#{bucket_name}" }
 
-      context 'when length is known' do
-        let(:has_length) { true }
+      it_behaves_like 'a valid AzureRM upload'
+      it_behaves_like 'a valid upload without multipart data'
 
-        it_behaves_like 'a valid AzureRM upload'
-        it_behaves_like 'a valid upload without multipart data'
-      end
+      context 'when a custom storage domain is used' do
+        let(:storage_domain) { 'blob.core.chinacloudapi.cn' }
+        let(:storage_url) { "https://azuretest.#{storage_domain}" }
+        let(:gocloud_url) { "azblob://#{bucket_name}?domain=#{storage_domain}" }
 
-      context 'when length is unknown' do
-        let(:has_length) { false }
+        before do
+          credentials[:azure_storage_domain] = storage_domain
+        end
 
         it_behaves_like 'a valid AzureRM upload'
-        it_behaves_like 'a valid upload without multipart data'
       end
     end
   end