Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into consolidate-page-widths-part02consolidate-page-widths-part02

1 files changed, 5 insertions, 26 deletions

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