Add latest changes from gitlab-org/gitlab@master

6 files changed, 309 insertions, 0 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
new file mode 100644
index 00000000000..fa0c7d83851
--- /dev/null
+++ b/spec/workers/gitlab/jira_import/stage/finish_import_worker_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::JiraImport::Stage::FinishImportWorker do
+  let(:project) { create(:project) }
+  let(:worker) { described_class.new }
+
+  describe 'modules' do
+    it_behaves_like 'include import workers modules'
+  end
+
+  describe '#perform' do
+    context 'when feature flag enabled' do
+      before do
+        stub_feature_flags(jira_issue_import: false)
+      end
+
+      it_behaves_like 'exit import not started'
+    end
+
+    context 'when feature flag enabled' do
+      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'
+      end
+
+      context 'when import started' do
+        let(:imported_jira_project) do
+          JiraImportData::JiraProjectDetails.new('xx', Time.now.strftime('%Y-%m-%d %H:%M:%S'), { user_id: 1, name: 'root' })
+        end
+        let(:jira_import_data) do
+          data = JiraImportData.new
+          data << imported_jira_project
+          data.force_import!
+          data
+        end
+        let(:import_state) { create(:import_state, status: :started) }
+        let(:project) { create(:project, import_type: 'jira', import_data: jira_import_data, import_state: import_state) }
+
+        it 'changes import state to finished' do
+          worker.perform(project.id)
+
+          expect(project.reload.import_state.status).to eq "finished"
+        end
+
+        it 'removes force-import flag' do
+          expect(project.reload.import_data.data['jira'][JiraImportData::FORCE_IMPORT_KEY]).to be true
+
+          worker.perform(project.id)
+
+          expect(project.reload.import_data.data['jira'][JiraImportData::FORCE_IMPORT_KEY]).to be nil
+          expect(project.reload.import_data.data['jira']).not_to be nil
+        end
+      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
new file mode 100644
index 00000000000..fa2f3501973
--- /dev/null
+++ b/spec/workers/gitlab/jira_import/stage/import_attachments_worker_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::JiraImport::Stage::ImportAttachmentsWorker do
+  let(:project) { create(:project) }
+  let(:worker) { described_class.new }
+
+  describe 'modules' do
+    it_behaves_like 'include import workers modules'
+  end
+
+  describe '#perform' do
+    context 'when feature flag enabled' do
+      before do
+        stub_feature_flags(jira_issue_import: false)
+      end
+
+      it_behaves_like 'exit import not started'
+    end
+
+    context 'when feature flag enabled' do
+      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'
+      end
+
+      context 'when import started' do
+        let!(:import_state) { create(:import_state, status: :started, project: project) }
+
+        it_behaves_like 'advance to next stage', :notes
+      end
+    end
+  end
+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
new file mode 100644
index 00000000000..b43519a3e5d
--- /dev/null
+++ b/spec/workers/gitlab/jira_import/stage/import_issues_worker_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::JiraImport::Stage::ImportIssuesWorker do
+  let(:project) { create(:project) }
+  let(:worker) { described_class.new }
+
+  describe 'modules' do
+    it_behaves_like 'include import workers modules'
+  end
+
+  describe '#perform' do
+    context 'when feature flag enabled' do
+      before do
+        stub_feature_flags(jira_issue_import: false)
+      end
+
+      it_behaves_like 'exit import not started'
+    end
+
+    context 'when feature flag enabled' do
+      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'
+      end
+
+      context 'when import started' do
+        let!(:import_state) { create(:import_state, status: :started, project: project) }
+
+        it_behaves_like 'advance to next stage', :attachments
+      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
new file mode 100644
index 00000000000..827efb85a17
--- /dev/null
+++ b/spec/workers/gitlab/jira_import/stage/import_labels_worker_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::JiraImport::Stage::ImportLabelsWorker do
+  let(:project) { create(:project) }
+  let(:worker) { described_class.new }
+
+  describe 'modules' do
+    it_behaves_like 'include import workers modules'
+  end
+
+  describe '#perform' do
+    context 'when feature flag enabled' do
+      before do
+        stub_feature_flags(jira_issue_import: false)
+      end
+
+      it_behaves_like 'exit import not started'
+    end
+
+    context 'when feature flag enabled' do
+      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'
+      end
+
+      context 'when import started' do
+        let!(:import_state) { create(:import_state, status: :started, project: project) }
+
+        it_behaves_like 'advance to next stage', :issues
+      end
+    end
+  end
+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
new file mode 100644
index 00000000000..bd6b36613cc
--- /dev/null
+++ b/spec/workers/gitlab/jira_import/stage/import_notes_worker_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::JiraImport::Stage::ImportNotesWorker do
+  let(:project) { create(:project) }
+  let(:worker) { described_class.new }
+
+  describe 'modules' do
+    it_behaves_like 'include import workers modules'
+  end
+
+  describe '#perform' do
+    context 'when feature flag enabled' do
+      before do
+        stub_feature_flags(jira_issue_import: false)
+      end
+
+      it_behaves_like 'exit import not started'
+    end
+
+    context 'when feature flag enabled' do
+      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'
+      end
+
+      context 'when import started' do
+        let!(:import_state) { create(:import_state, status: :started, project: project) }
+
+        it_behaves_like 'advance to next stage', :finish
+      end
+    end
+  end
+end
diff --git a/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb b/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb
new file mode 100644
index 00000000000..cc70277384d
--- /dev/null
+++ b/spec/workers/gitlab/jira_import/stage/start_import_worker_spec.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::JiraImport::Stage::StartImportWorker do
+  let(:project) { create(:project) }
+  let(:worker) { described_class.new }
+  let(:jid) { '12345678' }
+
+  describe 'modules' do
+    it_behaves_like 'include import workers modules'
+  end
+
+  describe '#perform' do
+    context 'when feature flag not enabled' do
+      before do
+        stub_feature_flags(jira_issue_import: false)
+      end
+
+      it 'exits because import not allowed' do
+        expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
+
+        worker.perform(project.id)
+      end
+    end
+
+    context 'when feature flag not enabled' do
+      before do
+        stub_feature_flags(jira_issue_import: true)
+      end
+
+      context 'when import is not scheudled' do
+        let!(:import_state) { create(:import_state, project: project, status: :none, jid: jid) }
+
+        it 'exits because import not started' do
+          expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
+
+          worker.perform(project.id)
+        end
+      end
+
+      context 'when import is scheduled' do
+        let!(:import_state) { create(:import_state, project: project, status: :scheduled, jid: jid) }
+
+        it 'advances to importing labels' do
+          expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).to receive(:perform_async)
+
+          worker.perform(project.id)
+        end
+      end
+
+      context 'when import is started' do
+        let!(:import_state) { create(:import_state, project: project, status: :started, jid: jid) }
+
+        context 'when this is the same worker that stated import' do
+          it 'advances to importing labels' do
+            allow(worker).to receive(:jid).and_return(jid)
+            expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).to receive(:perform_async)
+
+            worker.perform(project.id)
+          end
+        end
+
+        context 'when this is a different worker that stated import' do
+          it 'advances to importing labels' do
+            allow(worker).to receive(:jid).and_return('87654321')
+            expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
+
+            worker.perform(project.id)
+          end
+        end
+      end
+
+      context 'when import is finished' do
+        let!(:import_state) { create(:import_state, project: project, status: :finished, jid: jid) }
+
+        it 'advances to importing labels' do
+          allow(worker).to receive(:jid).and_return(jid)
+          expect(Gitlab::JiraImport::Stage::ImportLabelsWorker).not_to receive(:perform_async)
+
+          worker.perform(project.id)
+        end
+      end
+    end
+  end
+end