fix specs

2 files changed, 10 insertions, 30 deletions

diff --git a/spec/lib/gitlab/import_export/uploads_manager_spec.rb b/spec/lib/gitlab/import_export/uploads_manager_spec.rb
index b17ca23f2eb..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,37 +70,20 @@ describe Gitlab::ImportExport::UploadsManager do
         end
       end
     end
+  end
 
-    let!(:upload) { create(:upload, :issuable_upload, :object_storage, model: project) }
-
+  describe '#restore' do
     before do
       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
 
-      expect(File.read(exported_file_path)).to eq('File content')
+      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
-      before do
-        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.map { |u| u.build_uploader.filename }).to include('dummy.txt')
-      end
+      expect(project.uploads.map { |u| u.build_uploader.filename }).to include('dummy.txt')
     end
   end
 end
diff --git a/spec/requests/api/project_export_spec.rb b/spec/requests/api/project_export_spec.rb
index 45e4e35d773..b661a97881a 100644
--- a/spec/requests/api/project_export_spec.rb
+++ b/spec/requests/api/project_export_spec.rb
@@ -4,8 +4,8 @@ describe API::ProjectExport do
   set(:project) { create(:project) }
   set(:project_none) { create(:project) }
   set(:project_started) { create(:project) }
-  set(:project_finished) { create(:project) }
-  set(:project_after_export) { create(:project) }
+  let!(:project_finished) { create(:project, :with_export) }
+  let!(:project_after_export) { create(:project, :with_export) }
   set(:user) { create(:user) }
   set(:admin) { create(:admin) }
 
@@ -29,10 +29,6 @@ describe API::ProjectExport do
     # simulate exporting work directory
     FileUtils.mkdir_p File.join(project_started.export_path, 'securerandom-hex')
 
-    # simulate exported
-    FileUtils.mkdir_p project_finished.export_path
-    FileUtils.touch File.join(project_finished.export_path, '_export.tar.gz')
-
     # simulate in after export action
     FileUtils.mkdir_p project_after_export.export_path
     FileUtils.touch File.join(project_after_export.export_path, '_export.tar.gz')