Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/workers/bulk_imports/entity_worker_spec.rb b/spec/workers/bulk_imports/entity_worker_spec.rb
index 31515b31947..cd9a6f605b9 100644
--- a/spec/workers/bulk_imports/entity_worker_spec.rb
+++ b/spec/workers/bulk_imports/entity_worker_spec.rb
@@ -24,6 +24,20 @@ RSpec.describe BulkImports::EntityWorker do
 
         expect(entity.reload.jid).to eq(jid)
       end
+
+      context 'when exception occurs' do
+        it 'tracks the exception & marks entity as failed' do
+          allow(BulkImports::Importers::GroupImporter).to receive(:new) { raise StandardError }
+
+          expect(Gitlab::ErrorTracking)
+            .to receive(:track_exception)
+            .with(kind_of(StandardError), bulk_import_id: bulk_import.id, entity_id: entity.id)
+
+          subject.perform(entity.id)
+
+          expect(entity.reload.failed?).to eq(true)
+        end
+      end
     end
 
     context 'when started entity does not exist' do