Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/workers/gitlab/github_import/advance_stage_worker_spec.rb b/spec/workers/gitlab/github_import/advance_stage_worker_spec.rb
index 121f30ea9d5..2faa28a365e 100644
--- a/spec/workers/gitlab/github_import/advance_stage_worker_spec.rb
+++ b/spec/workers/gitlab/github_import/advance_stage_worker_spec.rb
@@ -35,6 +35,17 @@ RSpec.describe Gitlab::GithubImport::AdvanceStageWorker, :clean_gitlab_redis_sha
 
         worker.perform(project.id, { '123' => 2 }, :finish)
       end
+
+      context 'when import state is nil' do
+        let(:import_state) { nil }
+
+        it 'clears the JobWaiter cache and does not perform any work' do
+          expect(Gitlab::JobWaiter).to receive(:delete_key).with('123')
+          expect(worker).not_to receive(:wait_for_jobs)
+
+          worker.perform(project.id, { '123' => 2 }, :finish)
+        end
+      end
     end
 
     context 'when there are no remaining jobs' do