Merge branch '209967-object-storage-spec-tidy' into 'master'

Combine ObjectStorage spec contexts

See merge request gitlab-org/gitlab!29540

spec/uploaders/object_storage_spec.rb

@@ -596,22 +596,6 @@ describe ObjectStorage do
       uploader.cache!(uploaded_file)
     end
 
-    context 'when local file is used' do
-      context 'when valid file is used' do
-        let(:uploaded_file) do
-          fixture_file_upload('spec/fixtures/rails_sample.jpg', 'image/jpg')
-        end
-
-        it "properly caches the file" do
-          subject
-
-          expect(uploader).to be_exists
-          expect(uploader.path).to start_with(uploader_class.root)
-          expect(uploader.filename).to eq('rails_sample.jpg')
-        end
-      end
-    end
-
     context 'when local file is used' do
       let(:temp_file) { Tempfile.new("test") }
 
@@ -627,6 +611,14 @@ describe ObjectStorage do
         context 'when valid file is specified' do
           let(:uploaded_file) { temp_file }
 
+          it 'properly caches the file' do
+            subject
+
+            expect(uploader).to be_exists
+            expect(uploader.path).to start_with(uploader_class.root)
+            expect(uploader.filename).to eq(File.basename(uploaded_file.path))
+          end
+
           context 'when object storage and direct upload is specified' do
             before do
               stub_uploads_object_storage(uploader_class, enabled: true, direct_upload: true)