Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 4 deletions

diff --git a/spec/workers/gitlab/jira_import/import_issue_worker_spec.rb b/spec/workers/gitlab/jira_import/import_issue_worker_spec.rb
index c09492efcae..b6db803ddf5 100644
--- a/spec/workers/gitlab/jira_import/import_issue_worker_spec.rb
+++ b/spec/workers/gitlab/jira_import/import_issue_worker_spec.rb
@@ -32,12 +32,28 @@ describe Gitlab::JiraImport::ImportIssueWorker do
     end
 
     context 'when record is successfully inserted' do
-      before do
-        subject.perform(project.id, 123, issue_attrs, 'some-key')
+      let(:label) { create(:label, project: project) }
+
+      context 'when import label does not exist' do
+        it 'does not record import failure' do
+          subject.perform(project.id, 123, issue_attrs, 'some-key')
+
+          expect(label.issues.count).to eq(0)
+          expect(Gitlab::Cache::Import::Caching.read(Gitlab::JiraImport.failed_issues_counter_cache_key(project.id)).to_i).to eq(0)
+        end
       end
 
-      it 'does not record import failure' do
-        expect(Gitlab::Cache::Import::Caching.read(Gitlab::JiraImport.failed_issues_counter_cache_key(project.id)).to_i).to eq(0)
+      context 'when import label exists' do
+        before do
+          Gitlab::JiraImport.cache_import_label_id(project.id, label.id)
+        end
+
+        it 'does not record import failure' do
+          subject.perform(project.id, 123, issue_attrs, 'some-key')
+
+          expect(label.issues.count).to eq(1)
+          expect(Gitlab::Cache::Import::Caching.read(Gitlab::JiraImport.failed_issues_counter_cache_key(project.id)).to_i).to eq(0)
+        end
       end
     end
   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 2b156e0f489..a3e38cba115 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
@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 describe Gitlab::JiraImport::Stage::ImportLabelsWorker do
+  let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
 
   describe 'modules' do
@@ -30,9 +31,24 @@ describe Gitlab::JiraImport::Stage::ImportLabelsWorker do
       end
 
       context 'when import started' 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) }
 
         it_behaves_like 'advance to next stage', :issues
+
+        it 'executes labels importer' do
+          expect_next_instance_of(Gitlab::JiraImport::LabelsImporter) do |instance|
+            expect(instance).to receive(:execute).and_return(Gitlab::JobWaiter.new)
+          end
+
+          described_class.new.perform(project.id)
+        end
       end
     end
   end