Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/services/bulk_imports/relation_export_service_spec.rb b/spec/services/bulk_imports/relation_export_service_spec.rb
index 27a6ca60515..f0f85217d2e 100644
--- a/spec/services/bulk_imports/relation_export_service_spec.rb
+++ b/spec/services/bulk_imports/relation_export_service_spec.rb
@@ -88,6 +88,18 @@ RSpec.describe BulkImports::RelationExportService do
 
         subject.execute
       end
+
+      context 'when export is recently finished' do
+        it 'returns recently finished export instead of re-exporting' do
+          updated_at = 5.seconds.ago
+          export.update!(status: 1, updated_at: updated_at)
+
+          expect { subject.execute }.not_to change { export.updated_at }
+
+          expect(export.status).to eq(1)
+          expect(export.updated_at).to eq(updated_at)
+        end
+      end
     end
 
     context 'when exception occurs during export' do