Add latest changes from gitlab-org/gitlab@master

5 files changed, 25 insertions, 13 deletions

diff --git a/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb
index 93e2a44223b..4cb6f5e28b8 100644
--- a/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb
@@ -16,30 +16,42 @@ describe Gitlab::JiraImport::Stage::FinishImportWorker do
         stub_feature_flags(jira_issue_import: false)
       end
 
-      it_behaves_like 'cannot do jira import'
+      it_behaves_like 'cannot do Jira import'
     end
 
     context 'when feature flag enabled' do
-      let_it_be(:jira_import) { create(:jira_import_state, :scheduled, project: project) }
+      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
-        it_behaves_like 'cannot do jira import'
+        it_behaves_like 'cannot do Jira import'
       end
 
       context 'when import started' do
+        let_it_be(:import_label) { create(:label, project: project, title: 'jira-import') }
+        let_it_be(:imported_issues) { create_list(:labeled_issue, 3, project: project, labels: [import_label]) }
+
         before do
+          expect(Gitlab::JiraImport).to receive(:get_import_label_id).and_return(import_label.id)
+          expect(Gitlab::JiraImport).to receive(:issue_failures).and_return(2)
+
           jira_import.start!
+          worker.perform(project.id)
         end
 
         it 'changes import state to finished' do
-          worker.perform(project.id)
-
           expect(project.jira_import_status).to eq('finished')
         end
+
+        it 'saves imported issues counts' do
+          latest_jira_import = project.latest_jira_import
+          expect(latest_jira_import.total_issue_count).to eq(5)
+          expect(latest_jira_import.failed_to_import_count).to eq(2)
+          expect(latest_jira_import.imported_issues_count).to eq(3)
+        end
       end
     end
   end
diff --git a/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb
index 478cb447dc5..e6d41ae8bb4 100644
--- a/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb
@@ -15,7 +15,7 @@ describe Gitlab::JiraImport::Stage::ImportAttachmentsWorker do
         stub_feature_flags(jira_issue_import: false)
       end
 
-      it_behaves_like 'cannot do jira import'
+      it_behaves_like 'cannot do Jira import'
       it_behaves_like 'does not advance to next stage'
     end
 
@@ -27,7 +27,7 @@ describe Gitlab::JiraImport::Stage::ImportAttachmentsWorker do
       end
 
       context 'when import did not start' do
-        it_behaves_like 'cannot do jira import'
+        it_behaves_like 'cannot do Jira import'
         it_behaves_like 'does not advance to next stage'
       end
 
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 6470a293461..e19acbebd66 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
@@ -16,7 +16,7 @@ describe Gitlab::JiraImport::Stage::ImportIssuesWorker do
         stub_feature_flags(jira_issue_import: false)
       end
 
-      it_behaves_like 'cannot do jira import'
+      it_behaves_like 'cannot do Jira import'
       it_behaves_like 'does not advance to next stage'
     end
 
@@ -28,7 +28,7 @@ describe Gitlab::JiraImport::Stage::ImportIssuesWorker do
       end
 
       context 'when import did not start' do
-        it_behaves_like 'cannot do jira import'
+        it_behaves_like 'cannot do Jira import'
         it_behaves_like 'does not advance to next stage'
       end
 
diff --git a/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb
index f1562395546..52df5b1215c 100644
--- a/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb
@@ -16,7 +16,7 @@ describe Gitlab::JiraImport::Stage::ImportLabelsWorker do
         stub_feature_flags(jira_issue_import: false)
       end
 
-      it_behaves_like 'cannot do jira import'
+      it_behaves_like 'cannot do Jira import'
       it_behaves_like 'does not advance to next stage'
     end
 
@@ -28,7 +28,7 @@ describe Gitlab::JiraImport::Stage::ImportLabelsWorker do
       end
 
       context 'when import did not start' do
-        it_behaves_like 'cannot do jira import'
+        it_behaves_like 'cannot do Jira import'
         it_behaves_like 'does not advance to next stage'
       end
 
diff --git a/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb
index 956898c1abc..f9bdbd669d8 100644
--- a/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb
@@ -15,7 +15,7 @@ describe Gitlab::JiraImport::Stage::ImportNotesWorker do
         stub_feature_flags(jira_issue_import: false)
       end
 
-      it_behaves_like 'cannot do jira import'
+      it_behaves_like 'cannot do Jira import'
       it_behaves_like 'does not advance to next stage'
     end
 
@@ -27,7 +27,7 @@ describe Gitlab::JiraImport::Stage::ImportNotesWorker do
       end
 
       context 'when import did not start' do
-        it_behaves_like 'cannot do jira import'
+        it_behaves_like 'cannot do Jira import'
         it_behaves_like 'does not advance to next stage'
       end