Add latest changes from gitlab-org/gitlab@master

2 files changed, 99 insertions, 0 deletions

diff --git a/spec/services/jira_import/start_import_service_spec.rb b/spec/services/jira_import/start_import_service_spec.rb
new file mode 100644
index 00000000000..038c53b2b22
--- /dev/null
+++ b/spec/services/jira_import/start_import_service_spec.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe JiraImport::StartImportService do
+  let_it_be(:user) { create(:user) }
+  let(:project) { create(:project) }
+
+  subject { described_class.new(user, project, '').execute }
+
+  context 'when feature flag disabled' do
+    before do
+      stub_feature_flags(jira_issue_import: false)
+    end
+
+    it_behaves_like 'responds with error', 'Jira import feature is disabled.'
+  end
+
+  context 'when feature flag enabled' do
+    before do
+      stub_feature_flags(jira_issue_import: true)
+    end
+
+    context 'when user does not have permissions to run the import' do
+      before do
+        project.add_developer(user)
+      end
+
+      it_behaves_like 'responds with error', 'You do not have permissions to run the import.'
+    end
+
+    context 'when user has permission to run import' do
+      before do
+        project.add_maintainer(user)
+      end
+
+      context 'when Jira service was not setup' do
+        it_behaves_like 'responds with error', 'Jira integration not configured.'
+      end
+
+      context 'when Jira service exists' do
+        let!(:jira_service) { create(:jira_service, project: project, active: true) }
+
+        context 'when Jira project key is not provided' do
+          it_behaves_like 'responds with error', 'Unable to find Jira project to import data from.'
+        end
+
+        context 'when correct data provided' do
+          subject { described_class.new(user, project, 'some-key').execute }
+
+          context 'when import is already running' do
+            let!(:import_state) { create(:import_state, project: project, status: :started) }
+
+            it_behaves_like 'responds with error', 'Jira import is already running.'
+          end
+
+          it 'returns success response' do
+            expect(subject).to be_a(ServiceResponse)
+            expect(subject).to be_success
+          end
+
+          it 'schedules jira import' do
+            subject
+
+            expect(project.import_state.status).to eq('scheduled')
+          end
+
+          it 'creates jira import data' do
+            subject
+
+            jira_import_data = project.import_data.becomes(JiraImportData)
+            expect(jira_import_data.force_import?).to be true
+            imported_project_data = jira_import_data.projects.last
+            expect(imported_project_data.key).to eq('some-key')
+            expect(imported_project_data.scheduled_by['user_id']).to eq(user.id)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb b/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb
index 9832ba95524..163276db7e6 100644
--- a/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb
+++ b/spec/services/pages_domains/obtain_lets_encrypt_certificate_service_spec.rb
@@ -163,4 +163,22 @@ describe PagesDomains::ObtainLetsEncryptCertificateService do
       expect(PagesDomainAcmeOrder.find_by_id(existing_order.id)).to be_nil
     end
   end
+
+  context 'when order is invalid' do
+    let(:existing_order) do
+      create(:pages_domain_acme_order, pages_domain: pages_domain)
+    end
+
+    let!(:api_order) do
+      stub_lets_encrypt_order(existing_order.url, 'invalid')
+    end
+
+    it 'saves error to domain and deletes acme order' do
+      expect do
+        service.execute
+      end.to change { pages_domain.reload.auto_ssl_failed }.from(false).to(true)
+
+      expect(PagesDomainAcmeOrder.find_by_id(existing_order.id)).to be_nil
+    end
+  end
 end