Refactor code to remove object storage flag from Import/Export

Updated docs, refactor import/export code
Fix AvatarUploader path issue
Fix project export upload webhook error

13 files changed, 45 insertions, 410 deletions

diff --git a/spec/lib/gitlab/cleanup/project_uploads_spec.rb b/spec/lib/gitlab/cleanup/project_uploads_spec.rb
index 11e605eece6..bf130b8fabd 100644
--- a/spec/lib/gitlab/cleanup/project_uploads_spec.rb
+++ b/spec/lib/gitlab/cleanup/project_uploads_spec.rb
@@ -132,7 +132,6 @@ describe Gitlab::Cleanup::ProjectUploads do
             let!(:path) { File.join(FileUploader.root, orphaned.model.full_path, orphaned.path) }
 
             before do
-              stub_feature_flags(import_export_object_storage: true)
               stub_uploads_object_storage(FileUploader)
 
               FileUtils.mkdir_p(File.dirname(path))
@@ -156,7 +155,6 @@ describe Gitlab::Cleanup::ProjectUploads do
             let!(:new_path) { File.join(FileUploader.root, '-', 'project-lost-found', 'wrong', orphaned.path) }
 
             before do
-              stub_feature_flags(import_export_object_storage: true)
               stub_uploads_object_storage(FileUploader)
 
               FileUtils.mkdir_p(File.dirname(path))
diff --git a/spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_object_storage_spec.rb b/spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_object_storage_spec.rb
deleted file mode 100644
index 5059d68e54b..00000000000
--- a/spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_object_storage_spec.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::ImportExport::AfterExportStrategies::BaseAfterExportStrategy do
-  let!(:service) { described_class.new }
-  let!(:project) { create(:project, :with_object_export) }
-  let(:shared) { project.import_export_shared }
-  let!(:user) { create(:user) }
-
-  describe '#execute' do
-    before do
-      allow(service).to receive(:strategy_execute)
-      stub_feature_flags(import_export_object_storage: true)
-    end
-
-    it 'returns if project exported file is not found' do
-      allow(project).to receive(:export_project_object_exists?).and_return(false)
-
-      expect(service).not_to receive(:strategy_execute)
-
-      service.execute(user, project)
-    end
-
-    it 'creates a lock file in the export dir' do
-      allow(service).to receive(:delete_after_export_lock)
-
-      service.execute(user, project)
-
-      expect(lock_path_exist?).to be_truthy
-    end
-
-    context 'when the method succeeds' do
-      it 'removes the lock file' do
-        service.execute(user, project)
-
-        expect(lock_path_exist?).to be_falsey
-      end
-    end
-
-    context 'when the method fails' do
-      before do
-        allow(service).to receive(:strategy_execute).and_call_original
-      end
-
-      context 'when validation fails' do
-        before do
-          allow(service).to receive(:invalid?).and_return(true)
-        end
-
-        it 'does not create the lock file' do
-          expect(service).not_to receive(:create_or_update_after_export_lock)
-
-          service.execute(user, project)
-        end
-
-        it 'does not execute main logic' do
-          expect(service).not_to receive(:strategy_execute)
-
-          service.execute(user, project)
-        end
-
-        it 'logs validation errors in shared context' do
-          expect(service).to receive(:log_validation_errors)
-
-          service.execute(user, project)
-        end
-      end
-
-      context 'when an exception is raised' do
-        it 'removes the lock' do
-          expect { service.execute(user, project) }.to raise_error(NotImplementedError)
-
-          expect(lock_path_exist?).to be_falsey
-        end
-      end
-    end
-  end
-
-  describe '#log_validation_errors' do
-    it 'add the message to the shared context' do
-      errors = %w(test_message test_message2)
-
-      allow(service).to receive(:invalid?).and_return(true)
-      allow(service.errors).to receive(:full_messages).and_return(errors)
-
-      expect(shared).to receive(:add_error_message).twice.and_call_original
-
-      service.execute(user, project)
-
-      expect(shared.errors).to eq errors
-    end
-  end
-
-  describe '#to_json' do
-    it 'adds the current strategy class to the serialized attributes' do
-      params = { param1: 1 }
-      result = params.merge(klass: described_class.to_s).to_json
-
-      expect(described_class.new(params).to_json).to eq result
-    end
-  end
-
-  def lock_path_exist?
-    File.exist?(described_class.lock_file_path(project))
-  end
-end
diff --git a/spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_spec.rb b/spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_spec.rb
index 566b7f46c87..94a12221333 100644
--- a/spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_spec.rb
+++ b/spec/lib/gitlab/import_export/after_export_strategies/base_after_export_strategy_spec.rb
@@ -9,11 +9,10 @@ describe Gitlab::ImportExport::AfterExportStrategies::BaseAfterExportStrategy do
   describe '#execute' do
     before do
       allow(service).to receive(:strategy_execute)
-      stub_feature_flags(import_export_object_storage: false)
     end
 
     it 'returns if project exported file is not found' do
-      allow(project).to receive(:export_project_path).and_return(nil)
+      allow(project).to receive(:export_project_object_exists?).and_return(false)
 
       expect(service).not_to receive(:strategy_execute)
 
diff --git a/spec/lib/gitlab/import_export/after_export_strategies/web_upload_strategy_spec.rb b/spec/lib/gitlab/import_export/after_export_strategies/web_upload_strategy_spec.rb
index 7f2e0a4ee2c..ec17ad8541f 100644
--- a/spec/lib/gitlab/import_export/after_export_strategies/web_upload_strategy_spec.rb
+++ b/spec/lib/gitlab/import_export/after_export_strategies/web_upload_strategy_spec.rb
@@ -24,34 +24,13 @@ describe Gitlab::ImportExport::AfterExportStrategies::WebUploadStrategy do
   end
 
   describe '#execute' do
-    context 'without object storage' do
-      before do
-        stub_feature_flags(import_export_object_storage: false)
-      end
-
-      it 'removes the exported project file after the upload' do
-        allow(strategy).to receive(:send_file)
-        allow(strategy).to receive(:handle_response_error)
-
-        expect(project).to receive(:remove_exported_project_file)
-
-        strategy.execute(user, project)
-      end
-    end
-
-    context 'with object storage' do
-      before do
-        stub_feature_flags(import_export_object_storage: true)
-      end
+    it 'removes the exported project file after the upload' do
+      allow(strategy).to receive(:send_file)
+      allow(strategy).to receive(:handle_response_error)
 
-      it 'removes the exported project file after the upload' do
-        allow(strategy).to receive(:send_file)
-        allow(strategy).to receive(:handle_response_error)
+      expect(project).to receive(:remove_exports)
 
-        expect(project).to receive(:remove_exported_project_file)
-
-        strategy.execute(user, project)
-      end
+      strategy.execute(user, project)
     end
   end
 end
diff --git a/spec/lib/gitlab/import_export/avatar_saver_spec.rb b/spec/lib/gitlab/import_export/avatar_saver_spec.rb
index 90e6d653d34..2bd1b9924c6 100644
--- a/spec/lib/gitlab/import_export/avatar_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/avatar_saver_spec.rb
@@ -8,8 +8,7 @@ describe Gitlab::ImportExport::AvatarSaver do
 
   before do
     FileUtils.mkdir_p("#{shared.export_path}/avatar/")
-    allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
-    stub_feature_flags(import_export_object_storage: false)
+    allow_any_instance_of(Gitlab::ImportExport::Shared).to receive(:export_path).and_return(export_path)
   end
 
   after do
@@ -19,7 +18,7 @@ describe Gitlab::ImportExport::AvatarSaver do
   it 'saves a project avatar' do
     described_class.new(project: project_with_avatar, shared: shared).save
 
-    expect(File).to exist("#{shared.export_path}/avatar/dk.png")
+    expect(File).to exist(Dir["#{shared.export_path}/avatar/**/dk.png"].first)
   end
 
   it 'is fine not to have an avatar' do
diff --git a/spec/lib/gitlab/import_export/file_importer_object_storage_spec.rb b/spec/lib/gitlab/import_export/file_importer_object_storage_spec.rb
deleted file mode 100644
index 287745eb40e..00000000000
--- a/spec/lib/gitlab/import_export/file_importer_object_storage_spec.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::ImportExport::FileImporter do
-  let(:shared) { Gitlab::ImportExport::Shared.new(nil) }
-  let(:storage_path) { "#{Dir.tmpdir}/file_importer_spec" }
-  let(:valid_file) { "#{shared.export_path}/valid.json" }
-  let(:symlink_file) { "#{shared.export_path}/invalid.json" }
-  let(:hidden_symlink_file) { "#{shared.export_path}/.hidden" }
-  let(:subfolder_symlink_file) { "#{shared.export_path}/subfolder/invalid.json" }
-  let(:evil_symlink_file) { "#{shared.export_path}/.\nevil" }
-
-  before do
-    stub_const('Gitlab::ImportExport::FileImporter::MAX_RETRIES', 0)
-    stub_feature_flags(import_export_object_storage: true)
-    stub_uploads_object_storage(FileUploader)
-
-    allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(storage_path)
-    allow_any_instance_of(Gitlab::ImportExport::CommandLineUtil).to receive(:untar_zxf).and_return(true)
-    allow_any_instance_of(Gitlab::ImportExport::Shared).to receive(:relative_archive_path).and_return('test')
-    allow(SecureRandom).to receive(:hex).and_return('abcd')
-    setup_files
-  end
-
-  after do
-    FileUtils.rm_rf(storage_path)
-  end
-
-  context 'normal run' do
-    before do
-      described_class.import(project: build(:project), archive_file: '', shared: shared)
-    end
-
-    it 'removes symlinks in root folder' do
-      expect(File.exist?(symlink_file)).to be false
-    end
-
-    it 'removes hidden symlinks in root folder' do
-      expect(File.exist?(hidden_symlink_file)).to be false
-    end
-
-    it 'removes evil symlinks in root folder' do
-      expect(File.exist?(evil_symlink_file)).to be false
-    end
-
-    it 'removes symlinks in subfolders' do
-      expect(File.exist?(subfolder_symlink_file)).to be false
-    end
-
-    it 'does not remove a valid file' do
-      expect(File.exist?(valid_file)).to be true
-    end
-
-    it 'creates the file in the right subfolder' do
-      expect(shared.export_path).to include('test/abcd')
-    end
-  end
-
-  context 'error' do
-    before do
-      allow_any_instance_of(described_class).to receive(:wait_for_archived_file).and_raise(StandardError)
-      described_class.import(project: build(:project), archive_file: '', shared: shared)
-    end
-
-    it 'removes symlinks in root folder' do
-      expect(File.exist?(symlink_file)).to be false
-    end
-
-    it 'removes hidden symlinks in root folder' do
-      expect(File.exist?(hidden_symlink_file)).to be false
-    end
-
-    it 'removes symlinks in subfolders' do
-      expect(File.exist?(subfolder_symlink_file)).to be false
-    end
-
-    it 'does not remove a valid file' do
-      expect(File.exist?(valid_file)).to be true
-    end
-  end
-
-  def setup_files
-    FileUtils.mkdir_p("#{shared.export_path}/subfolder/")
-    FileUtils.touch(valid_file)
-    FileUtils.ln_s(valid_file, symlink_file)
-    FileUtils.ln_s(valid_file, subfolder_symlink_file)
-    FileUtils.ln_s(valid_file, hidden_symlink_file)
-    FileUtils.ln_s(valid_file, evil_symlink_file)
-  end
-end
diff --git a/spec/lib/gitlab/import_export/file_importer_spec.rb b/spec/lib/gitlab/import_export/file_importer_spec.rb
index 78fccdf1dfc..bf34cefe18f 100644
--- a/spec/lib/gitlab/import_export/file_importer_spec.rb
+++ b/spec/lib/gitlab/import_export/file_importer_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::ImportExport::FileImporter do
   let(:shared) { Gitlab::ImportExport::Shared.new(nil) }
-  let(:export_path) { "#{Dir.tmpdir}/file_importer_spec" }
+  let(:storage_path) { "#{Dir.tmpdir}/file_importer_spec" }
   let(:valid_file) { "#{shared.export_path}/valid.json" }
   let(:symlink_file) { "#{shared.export_path}/invalid.json" }
   let(:hidden_symlink_file) { "#{shared.export_path}/.hidden" }
@@ -11,7 +11,9 @@ describe Gitlab::ImportExport::FileImporter do
 
   before do
     stub_const('Gitlab::ImportExport::FileImporter::MAX_RETRIES', 0)
-    allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+    stub_uploads_object_storage(FileUploader)
+
+    allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(storage_path)
     allow_any_instance_of(Gitlab::ImportExport::CommandLineUtil).to receive(:untar_zxf).and_return(true)
     allow_any_instance_of(Gitlab::ImportExport::Shared).to receive(:relative_archive_path).and_return('test')
     allow(SecureRandom).to receive(:hex).and_return('abcd')
@@ -19,12 +21,12 @@ describe Gitlab::ImportExport::FileImporter do
   end
 
   after do
-    FileUtils.rm_rf(export_path)
+    FileUtils.rm_rf(storage_path)
   end
 
   context 'normal run' do
     before do
-      described_class.import(project: nil, archive_file: '', shared: shared)
+      described_class.import(project: build(:project), archive_file: '', shared: shared)
     end
 
     it 'removes symlinks in root folder' do
@@ -55,7 +57,7 @@ describe Gitlab::ImportExport::FileImporter do
   context 'error' do
     before do
       allow_any_instance_of(described_class).to receive(:wait_for_archived_file).and_raise(StandardError)
-      described_class.import(project: nil, archive_file: '', shared: shared)
+      described_class.import(project: build(:project), archive_file: '', shared: shared)
     end
 
     it 'removes symlinks in root folder' do
diff --git a/spec/lib/gitlab/import_export/importer_object_storage_spec.rb b/spec/lib/gitlab/import_export/importer_object_storage_spec.rb
deleted file mode 100644
index 24a994b3611..00000000000
--- a/spec/lib/gitlab/import_export/importer_object_storage_spec.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::ImportExport::Importer do
-  let(:user) { create(:user) }
-  let(:test_path) { "#{Dir.tmpdir}/importer_spec" }
-  let(:shared) { project.import_export_shared }
-  let(:project) { create(:project) }
-  let(:import_file) { fixture_file_upload('spec/features/projects/import_export/test_project_export.tar.gz') }
-
-  subject(:importer) { described_class.new(project) }
-
-  before do
-    allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(test_path)
-    allow_any_instance_of(Gitlab::ImportExport::FileImporter).to receive(:remove_import_file)
-    stub_feature_flags(import_export_object_storage: true)
-    stub_uploads_object_storage(FileUploader)
-
-    FileUtils.mkdir_p(shared.export_path)
-    ImportExportUpload.create(project: project, import_file: import_file)
-  end
-
-  after do
-    FileUtils.rm_rf(test_path)
-  end
-
-  describe '#execute' do
-    it 'succeeds' do
-      importer.execute
-
-      expect(shared.errors).to be_empty
-    end
-
-    it 'extracts the archive'  do
-      expect(Gitlab::ImportExport::FileImporter).to receive(:import).and_call_original
-
-      importer.execute
-    end
-
-    it 'checks the version' do
-      expect(Gitlab::ImportExport::VersionChecker).to receive(:check!).and_call_original
-
-      importer.execute
-    end
-
-    context 'all restores are executed' do
-      [
-        Gitlab::ImportExport::AvatarRestorer,
-        Gitlab::ImportExport::RepoRestorer,
-        Gitlab::ImportExport::WikiRestorer,
-        Gitlab::ImportExport::UploadsRestorer,
-        Gitlab::ImportExport::LfsRestorer,
-        Gitlab::ImportExport::StatisticsRestorer
-      ].each do |restorer|
-        it "calls the #{restorer}" do
-          fake_restorer = double(restorer.to_s)
-
-          expect(fake_restorer).to receive(:restore).and_return(true).at_least(1)
-          expect(restorer).to receive(:new).and_return(fake_restorer).at_least(1)
-
-          importer.execute
-        end
-      end
-
-      it 'restores the ProjectTree' do
-        expect(Gitlab::ImportExport::ProjectTreeRestorer).to receive(:new).and_call_original
-
-        importer.execute
-      end
-
-      it 'removes the import file' do
-        expect(importer).to receive(:remove_import_file).and_call_original
-
-        importer.execute
-
-        expect(project.import_export_upload.import_file&.file).to be_nil
-      end
-    end
-
-    context 'when project successfully restored' do
-      let!(:existing_project) { create(:project, namespace: user.namespace) }
-      let(:project) { create(:project, namespace: user.namespace, name: 'whatever', path: 'whatever') }
-
-      before do
-        restorers = double(:restorers, all?: true)
-
-        allow(subject).to receive(:import_file).and_return(true)
-        allow(subject).to receive(:check_version!).and_return(true)
-        allow(subject).to receive(:restorers).and_return(restorers)
-        allow(project).to receive(:import_data).and_return(double(data: { 'original_path' => existing_project.path }))
-      end
-
-      context 'when import_data' do
-        context 'has original_path' do
-          it 'overwrites existing project' do
-            expect_any_instance_of(::Projects::OverwriteProjectService).to receive(:execute).with(existing_project)
-
-            subject.execute
-          end
-        end
-
-        context 'has not original_path' do
-          before do
-            allow(project).to receive(:import_data).and_return(double(data: {}))
-          end
-
-          it 'does not call the overwrite service' do
-            expect_any_instance_of(::Projects::OverwriteProjectService).not_to receive(:execute).with(existing_project)
-
-            subject.execute
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/import_export/importer_spec.rb b/spec/lib/gitlab/import_export/importer_spec.rb
index 8053c48ad6c..11f98d782b1 100644
--- a/spec/lib/gitlab/import_export/importer_spec.rb
+++ b/spec/lib/gitlab/import_export/importer_spec.rb
@@ -4,16 +4,18 @@ describe Gitlab::ImportExport::Importer do
   let(:user) { create(:user) }
   let(:test_path) { "#{Dir.tmpdir}/importer_spec" }
   let(:shared) { project.import_export_shared }
-  let(:project) { create(:project, import_source: File.join(test_path, 'test_project_export.tar.gz')) }
+  let(:project) { create(:project) }
+  let(:import_file) { fixture_file_upload('spec/features/projects/import_export/test_project_export.tar.gz') }
 
   subject(:importer) { described_class.new(project) }
 
   before do
     allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(test_path)
     allow_any_instance_of(Gitlab::ImportExport::FileImporter).to receive(:remove_import_file)
+    stub_uploads_object_storage(FileUploader)
 
     FileUtils.mkdir_p(shared.export_path)
-    FileUtils.cp(Rails.root.join('spec/features/projects/import_export/test_project_export.tar.gz'), test_path)
+    ImportExportUpload.create(project: project, import_file: import_file)
   end
 
   after do
@@ -64,6 +66,14 @@ describe Gitlab::ImportExport::Importer do
         importer.execute
       end
 
+      it 'removes the import file' do
+        expect(importer).to receive(:remove_import_file).and_call_original
+
+        importer.execute
+
+        expect(project.import_export_upload.import_file&.file).to be_nil
+      end
+
       it 'sets the correct visibility_level when visibility level is a string' do
         project.create_or_update_import_data(
           data: { override_params: { visibility_level: Gitlab::VisibilityLevel::PRIVATE.to_s } }
@@ -85,7 +95,6 @@ describe Gitlab::ImportExport::Importer do
         allow(subject).to receive(:import_file).and_return(true)
         allow(subject).to receive(:check_version!).and_return(true)
         allow(subject).to receive(:restorers).and_return(restorers)
-        allow(restorers).to receive(:all?).and_return(true)
         allow(project).to receive(:import_data).and_return(double(data: { 'original_path' => existing_project.path }))
       end
 
diff --git a/spec/lib/gitlab/import_export/saver_spec.rb b/spec/lib/gitlab/import_export/saver_spec.rb
index 02f1a4b81aa..d185ff2dfcc 100644
--- a/spec/lib/gitlab/import_export/saver_spec.rb
+++ b/spec/lib/gitlab/import_export/saver_spec.rb
@@ -18,26 +18,12 @@ describe Gitlab::ImportExport::Saver do
     FileUtils.rm_rf(export_path)
   end
 
-  context 'local archive' do
-    it 'saves the repo to disk' do
-      stub_feature_flags(import_export_object_storage: false)
+  it 'saves the repo using object storage' do
+    stub_uploads_object_storage(ImportExportUploader)
 
-      subject.save
+    subject.save
 
-      expect(shared.errors).to be_empty
-      expect(Dir.empty?(shared.archive_path)).to be false
-    end
-  end
-
-  context 'object storage' do
-    it 'saves the repo using object storage' do
-      stub_feature_flags(import_export_object_storage: true)
-      stub_uploads_object_storage(ImportExportUploader)
-
-      subject.save
-
-      expect(ImportExportUpload.find_by(project: project).export_file.url)
-        .to match(%r[\/uploads\/-\/system\/import_export_upload\/export_file.*])
-    end
+    expect(ImportExportUpload.find_by(project: project).export_file.url)
+      .to match(%r[\/uploads\/-\/system\/import_export_upload\/export_file.*])
   end
 end
diff --git a/spec/lib/gitlab/import_export/uploads_manager_spec.rb b/spec/lib/gitlab/import_export/uploads_manager_spec.rb
index f799de18cd0..792117e1df1 100644
--- a/spec/lib/gitlab/import_export/uploads_manager_spec.rb
+++ b/spec/lib/gitlab/import_export/uploads_manager_spec.rb
@@ -4,6 +4,7 @@ describe Gitlab::ImportExport::UploadsManager do
   let(:shared) { project.import_export_shared }
   let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
   let(:project) { create(:project) }
+  let(:upload) { create(:upload, :issuable_upload, :object_storage, model: project) }
   let(:exported_file_path) { "#{shared.export_path}/uploads/#{upload.secret}/#{File.basename(upload.path)}" }
 
   subject(:manager) { described_class.new(project: project, shared: shared) }
@@ -69,44 +70,20 @@ describe Gitlab::ImportExport::UploadsManager do
         end
       end
     end
+  end
 
-    context 'using object storage' do
-      let!(:upload) { create(:upload, :issuable_upload, :object_storage, model: project) }
-
-      before do
-        stub_feature_flags(import_export_object_storage: true)
-        stub_uploads_object_storage(FileUploader)
-      end
-
-      it 'saves the file' do
-        fake_uri = double
-
-        expect(fake_uri).to receive(:open).and_return(StringIO.new('File content'))
-        expect(URI).to receive(:parse).and_return(fake_uri)
-
-        manager.save
+  describe '#restore' do
+    before do
+      stub_uploads_object_storage(FileUploader)
 
-        expect(File.read(exported_file_path)).to eq('File content')
-      end
+      FileUtils.mkdir_p(File.join(shared.export_path, 'uploads/72a497a02fe3ee09edae2ed06d390038'))
+      FileUtils.touch(File.join(shared.export_path, 'uploads/72a497a02fe3ee09edae2ed06d390038', "dummy.txt"))
     end
 
-    describe '#restore' do
-      context 'using object storage' do
-        before do
-          stub_feature_flags(import_export_object_storage: true)
-          stub_uploads_object_storage(FileUploader)
-
-          FileUtils.mkdir_p(File.join(shared.export_path, 'uploads/72a497a02fe3ee09edae2ed06d390038'))
-          FileUtils.touch(File.join(shared.export_path, 'uploads/72a497a02fe3ee09edae2ed06d390038', "dummy.txt"))
-        end
+    it 'restores the file' do
+      manager.restore
 
-        it 'restores the file' do
-          manager.restore
-
-          expect(project.uploads.size).to eq(1)
-          expect(project.uploads.first.build_uploader.filename).to eq('dummy.txt')
-        end
-      end
+      expect(project.uploads.map { |u| u.build_uploader.filename }).to include('dummy.txt')
     end
   end
 end
diff --git a/spec/lib/gitlab/import_export/uploads_restorer_spec.rb b/spec/lib/gitlab/import_export/uploads_restorer_spec.rb
index acef97459b8..6072f18b8c7 100644
--- a/spec/lib/gitlab/import_export/uploads_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/uploads_restorer_spec.rb
@@ -8,7 +8,7 @@ describe Gitlab::ImportExport::UploadsRestorer do
     before do
       allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
       FileUtils.mkdir_p(File.join(shared.export_path, 'uploads/random'))
-      FileUtils.touch(File.join(shared.export_path, 'uploads/random', "dummy.txt"))
+      FileUtils.touch(File.join(shared.export_path, 'uploads/random', 'dummy.txt'))
     end
 
     after do
@@ -27,9 +27,7 @@ describe Gitlab::ImportExport::UploadsRestorer do
       it 'copies the uploads to the project path' do
         subject.restore
 
-        uploads = Dir.glob(File.join(subject.uploads_path, '**/*')).map { |file| File.basename(file) }
-
-        expect(uploads).to include('dummy.txt')
+        expect(project.uploads.map { |u| u.build_uploader.filename }).to include('dummy.txt')
       end
     end
 
@@ -45,9 +43,7 @@ describe Gitlab::ImportExport::UploadsRestorer do
       it 'copies the uploads to the project path' do
         subject.restore
 
-        uploads = Dir.glob(File.join(subject.uploads_path, '**/*')).map { |file| File.basename(file) }
-
-        expect(uploads).to include('dummy.txt')
+        expect(project.uploads.map { |u| u.build_uploader.filename }).to include('dummy.txt')
       end
     end
   end
diff --git a/spec/lib/gitlab/import_export/uploads_saver_spec.rb b/spec/lib/gitlab/import_export/uploads_saver_spec.rb
index c716edd9397..24993460e51 100644
--- a/spec/lib/gitlab/import_export/uploads_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/uploads_saver_spec.rb
@@ -7,7 +7,6 @@ describe Gitlab::ImportExport::UploadsSaver do
     let(:shared) { project.import_export_shared }
 
     before do
-      stub_feature_flags(import_export_object_storage: false)
       allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
     end