Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 14 deletions

diff --git a/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb
index dca748a6ebc..6470a293461 100644
--- a/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb
@@ -4,43 +4,39 @@ require 'spec_helper'
 
 describe Gitlab::JiraImport::Stage::ImportIssuesWorker do
   let_it_be(:user) { create(:user) }
-  let_it_be(:project) { create(:project) }
+  let_it_be(:project) { create(:project, import_type: 'jira') }
 
   describe 'modules' do
     it_behaves_like 'include import workers modules'
   end
 
   describe '#perform' do
-    context 'when feature flag enabled' do
+    context 'when feature flag disabled' do
       before do
         stub_feature_flags(jira_issue_import: false)
       end
 
-      it_behaves_like 'exit import not started'
+      it_behaves_like 'cannot do jira import'
+      it_behaves_like 'does not advance to next stage'
     end
 
     context 'when feature flag enabled' do
+      let_it_be(:jira_import, reload: true) { create(:jira_import_state, :scheduled, project: project) }
+
       before do
         stub_feature_flags(jira_issue_import: true)
       end
 
       context 'when import did not start' do
-        let!(:import_state) { create(:import_state, project: project) }
-
-        it_behaves_like 'exit import not started'
+        it_behaves_like 'cannot do jira import'
+        it_behaves_like 'does not advance to next stage'
       end
 
       context 'when import started', :clean_gitlab_redis_cache do
-        let(:jira_import_data) do
-          data = JiraImportData.new
-          data << JiraImportData::JiraProjectDetails.new('XX', Time.now.strftime('%Y-%m-%d %H:%M:%S'), { user_id: user.id, name: user.name })
-          data
-        end
-        let(:project) { create(:project, import_data: jira_import_data) }
-        let!(:jira_service) { create(:jira_service, project: project) }
-        let!(:import_state) { create(:import_state, status: :started, project: project) }
+        let_it_be(:jira_service) { create(:jira_service, project: project) }
 
         before do
+          jira_import.start!
           allow_next_instance_of(Gitlab::JiraImport::IssuesImporter) do |instance|
             allow(instance).to receive(:fetch_issues).and_return([])
           end