1 files changed, 11 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/saver_spec.rb b/spec/lib/gitlab/import_export/saver_spec.rb
index a59cf7a1260..18e9d7da32d 100644
--- a/spec/lib/gitlab/import_export/saver_spec.rb
+++ b/spec/lib/gitlab/import_export/saver_spec.rb
@@ -5,18 +5,21 @@ require 'fileutils'
 
 describe Gitlab::ImportExport::Saver do
   let!(:project) { create(:project, :public, name: 'project') }
-  let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
+  let(:base_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
+  let(:export_path) { "#{base_path}/project_tree_saver_spec/export" }
   let(:shared) { project.import_export_shared }
 
   subject { described_class.new(exportable: project, shared: shared) }
 
   before do
+    allow(shared).to receive(:base_path).and_return(base_path)
     allow_next_instance_of(Gitlab::ImportExport) do |instance|
       allow(instance).to receive(:storage_path).and_return(export_path)
     end
 
     FileUtils.mkdir_p(shared.export_path)
     FileUtils.touch("#{shared.export_path}/tmp.bundle")
+    allow(FileUtils).to receive(:rm_rf).and_call_original
   end
 
   after do
@@ -31,4 +34,11 @@ describe Gitlab::ImportExport::Saver do
     expect(ImportExportUpload.find_by(project: project).export_file.url)
       .to match(%r[\/uploads\/-\/system\/import_export_upload\/export_file.*])
   end
+
+  it 'removes tmp files' do
+    subject.save
+
+    expect(FileUtils).to have_received(:rm_rf).with(base_path)
+    expect(Dir.exist?(base_path)).to eq(false)
+  end
 end