Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 3 deletions

diff --git a/spec/support/shared_examples/graphql/jira_import/jira_import_resolved_shared_examples.rb b/spec/support/shared_examples/graphql/jira_import/jira_import_resolver_shared_examples.rb
index b1d178521bb..3d97fe10a47 100644
--- a/spec/support/shared_examples/graphql/jira_import/jira_import_resolved_shared_examples.rb
+++ b/spec/support/shared_examples/graphql/jira_import/jira_import_resolver_shared_examples.rb
@@ -2,7 +2,7 @@
 
 shared_examples 'no jira import data present' do
   it 'returns none' do
-    expect(resolve_imports).to eq JiraImportData.none
+    expect(resolve_imports).to eq JiraImportState.none
   end
 end
 
diff --git a/spec/support/shared_examples/workers/gitlab/jira_import/jira_import_workers_shared_examples.rb b/spec/support/shared_examples/workers/gitlab/jira_import/jira_import_workers_shared_examples.rb
index 71ec1ea6a74..c0d17d6853d 100644
--- a/spec/support/shared_examples/workers/gitlab/jira_import/jira_import_workers_shared_examples.rb
+++ b/spec/support/shared_examples/workers/gitlab/jira_import/jira_import_workers_shared_examples.rb
@@ -12,14 +12,23 @@ shared_examples 'include import workers modules' do
   end
 end
 
-shared_examples 'exit import not started' do
-  it 'does nothing, and exits' do
+shared_examples 'does not advance to next stage' do
+  it 'does not advance to next stage' do
     expect(Gitlab::JiraImport::AdvanceStageWorker).not_to receive(:perform_async)
 
     described_class.new.perform(project.id)
   end
 end
 
+shared_examples 'cannot do jira import' do
+  it 'does not advance to next stage' do
+    worker = described_class.new
+    expect(worker).not_to receive(:import)
+
+    worker.perform(project.id)
+  end
+end
+
 shared_examples 'advance to next stage' do |next_stage|
   let(:job_waiter) { Gitlab::JobWaiter.new(2, 'some-job-key') }