From 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 19 Sep 2022 23:18:09 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-4-stable-ee

---
 spec/lib/object_storage/direct_upload_spec.rb | 98 +++++++++++----------------
 1 file changed, 41 insertions(+), 57 deletions(-)

(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 18a58522d12..1629aec89f5 100644
--- a/spec/lib/object_storage/direct_upload_spec.rb
+++ b/spec/lib/object_storage/direct_upload_spec.rb
@@ -342,84 +342,68 @@ RSpec.describe ObjectStorage::DirectUpload do
       context 'when length is unknown' do
         let(:has_length) { false }
 
-        context 'when s3_omit_multipart_urls feature flag is enabled' do
-          let(:consolidated_settings) { true }
-
-          it 'omits multipart URLs' do
-            expect(subject).not_to have_key(:MultipartUpload)
-          end
-
-          it_behaves_like 'a valid upload'
-        end
-
-        context 'when s3_omit_multipart_urls feature flag is disabled' do
+        it_behaves_like 'a valid S3 upload with multipart data' do
           before do
-            stub_feature_flags(s3_omit_multipart_urls: false)
+            stub_object_storage_multipart_init(storage_url, "myUpload")
           end
 
-          it_behaves_like 'a valid S3 upload with multipart data' do
-            before do
-              stub_object_storage_multipart_init(storage_url, "myUpload")
-            end
-
-            context 'when maximum upload size is 0' do
-              let(:maximum_size) { 0 }
+          context 'when maximum upload size is 0' do
+            let(:maximum_size) { 0 }
 
-              it 'returns maximum number of parts' do
-                expect(subject[:MultipartUpload][:PartURLs].length).to eq(100)
-              end
+            it 'returns maximum number of parts' do
+              expect(subject[:MultipartUpload][:PartURLs].length).to eq(100)
+            end
 
-              it 'part size is minimum, 5MB' do
-                expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte)
-              end
+            it 'part size is minimum, 5MB' do
+              expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte)
             end
+          end
 
-            context 'when maximum upload size is < 5 MB' do
-              let(:maximum_size) { 1024 }
+          context 'when maximum upload size is < 5 MB' do
+            let(:maximum_size) { 1024 }
 
-              it 'returns only 1 part' do
-                expect(subject[:MultipartUpload][:PartURLs].length).to eq(1)
-              end
+            it 'returns only 1 part' do
+              expect(subject[:MultipartUpload][:PartURLs].length).to eq(1)
+            end
 
-              it 'part size is minimum, 5MB' do
-                expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte)
-              end
+            it 'part size is minimum, 5MB' do
+              expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte)
             end
+          end
 
-            context 'when maximum upload size is 10MB' do
-              let(:maximum_size) { 10.megabyte }
+          context 'when maximum upload size is 10MB' do
+            let(:maximum_size) { 10.megabyte }
 
-              it 'returns only 2 parts' do
-                expect(subject[:MultipartUpload][:PartURLs].length).to eq(2)
-              end
+            it 'returns only 2 parts' do
+              expect(subject[:MultipartUpload][:PartURLs].length).to eq(2)
+            end
 
-              it 'part size is minimum, 5MB' do
-                expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte)
-              end
+            it 'part size is minimum, 5MB' do
+              expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte)
             end
+          end
 
-            context 'when maximum upload size is 12MB' do
-              let(:maximum_size) { 12.megabyte }
+          context 'when maximum upload size is 12MB' do
+            let(:maximum_size) { 12.megabyte }
 
-              it 'returns only 3 parts' do
-                expect(subject[:MultipartUpload][:PartURLs].length).to eq(3)
-              end
+            it 'returns only 3 parts' do
+              expect(subject[:MultipartUpload][:PartURLs].length).to eq(3)
+            end
 
-              it 'part size is rounded-up to 5MB' do
-                expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte)
-              end
+            it 'part size is rounded-up to 5MB' do
+              expect(subject[:MultipartUpload][:PartSize]).to eq(5.megabyte)
             end
+          end
 
-            context 'when maximum upload size is 49GB' do
-              let(:maximum_size) { 49.gigabyte }
+          context 'when maximum upload size is 49GB' do
+            let(:maximum_size) { 49.gigabyte }
 
-              it 'returns maximum, 100 parts' do
-                expect(subject[:MultipartUpload][:PartURLs].length).to eq(100)
-              end
+            it 'returns maximum, 100 parts' do
+              expect(subject[:MultipartUpload][:PartURLs].length).to eq(100)
+            end
 
-              it 'part size is rounded-up to 5MB' do
-                expect(subject[:MultipartUpload][:PartSize]).to eq(505.megabyte)
-              end
+            it 'part size is rounded-up to 5MB' do
+              expect(subject[:MultipartUpload][:PartSize]).to eq(505.megabyte)
             end
           end
         end
-- 
cgit v1.2.3