Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 27 deletions

diff --git a/spec/workers/bulk_import_worker_spec.rb b/spec/workers/bulk_import_worker_spec.rb
index 862dbce3177..12783f40528 100644
--- a/spec/workers/bulk_import_worker_spec.rb
+++ b/spec/workers/bulk_import_worker_spec.rb
@@ -3,37 +3,14 @@
 require 'spec_helper'
 
 RSpec.describe BulkImportWorker do
-  let!(:bulk_import) { create(:bulk_import, :started) }
-  let!(:entity) { create(:bulk_import_entity, bulk_import: bulk_import) }
-  let(:importer) { double(execute: nil) }
-
-  subject { described_class.new }
-
   describe '#perform' do
-    before do
-      allow(BulkImports::Importers::GroupImporter).to receive(:new).and_return(importer)
-    end
-
     it 'executes Group Importer' do
-      expect(importer).to receive(:execute)
-
-      subject.perform(bulk_import.id)
-    end
-
-    it 'updates bulk import and entity state' do
-      subject.perform(bulk_import.id)
-
-      expect(bulk_import.reload.human_status_name).to eq('finished')
-      expect(entity.reload.human_status_name).to eq('finished')
-    end
+      bulk_import_id = 1
 
-    context 'when bulk import could not be found' do
-      it 'does nothing' do
-        expect(bulk_import).not_to receive(:top_level_groups)
-        expect(bulk_import).not_to receive(:finish!)
+      expect(BulkImports::Importers::GroupsImporter)
+        .to receive(:new).with(bulk_import_id).and_return(double(execute: true))
 
-        subject.perform(non_existing_record_id)
-      end
+      described_class.new.perform(bulk_import_id)
     end
   end
 end