From 2c156e3c7bbade01c36eee18327f1ced6eebea79 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 17 Mar 2020 18:09:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../projects/import_export/export_service_spec.rb | 24 +++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'spec/services/projects') diff --git a/spec/services/projects/import_export/export_service_spec.rb b/spec/services/projects/import_export/export_service_spec.rb index e00507d1827..1315ae26322 100644 --- a/spec/services/projects/import_export/export_service_spec.rb +++ b/spec/services/projects/import_export/export_service_spec.rb @@ -26,10 +26,28 @@ describe Projects::ImportExport::ExportService do service.execute end - it 'saves the models' do - expect(Gitlab::ImportExport::Project::TreeSaver).to receive(:new).and_call_original + context 'when :streaming_serializer feature is enabled' do + before do + stub_feature_flags(streaming_serializer: true) + end - service.execute + it 'saves the models' do + expect(Gitlab::ImportExport::Project::TreeSaver).to receive(:new).and_call_original + + service.execute + end + end + + context 'when :streaming_serializer feature is disabled' do + before do + stub_feature_flags(streaming_serializer: false) + end + + it 'saves the models' do + expect(Gitlab::ImportExport::Project::LegacyTreeSaver).to receive(:new).and_call_original + + service.execute + end end it 'saves the uploads' do -- cgit v1.2.3