Merge branch '58886-issue-tracker-fields' into 'master'

Create models for issue trackers data

See merge request gitlab-org/gitlab-ce!28598

6 files changed, 100 insertions, 0 deletions

diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 40c3a6d90d0..33254d607c9 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -26,6 +26,7 @@ describe 'Database schema' do
     forked_project_links: %w[forked_from_project_id],
     identities: %w[user_id],
     issues: %w[last_edited_by_id state_id],
+    jira_tracker_data: %w[jira_issue_transition_id],
     keys: %w[user_id],
     label_links: %w[target_id],
     lfs_objects_projects: %w[lfs_object_id project_id],
diff --git a/spec/factories/services_data.rb b/spec/factories/services_data.rb
new file mode 100644
index 00000000000..387e130a743
--- /dev/null
+++ b/spec/factories/services_data.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :jira_tracker_data do
+    service
+    url 'http://jira.example.com'
+    api_url 'http://api-jira.example.com'
+    username 'jira_username'
+    password 'jira_password'
+  end
+
+  factory :issue_tracker_data do
+    service
+    project_url 'http://issuetracker.example.com'
+    issues_url 'http://issues.example.com'
+    new_issue_url 'http://new-issue.example.com'
+  end
+end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 2242543daad..002359e5cc0 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -175,6 +175,8 @@ deploy_keys:
 services:
 - project
 - service_hook
+- jira_tracker_data
+- issue_tracker_data
 hooks:
 - project
 - web_hook_logs
diff --git a/spec/models/project_services/issue_tracker_data_spec.rb b/spec/models/project_services/issue_tracker_data_spec.rb
new file mode 100644
index 00000000000..aaab654f874
--- /dev/null
+++ b/spec/models/project_services/issue_tracker_data_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe IssueTrackerData do
+  let(:service) { create(:custom_issue_tracker_service, active: false, properties: {}) }
+
+  describe 'Associations' do
+    it { is_expected.to belong_to :service }
+  end
+
+  describe 'Validations' do
+    subject { described_class.new(service: service) }
+
+    context 'url validations' do
+      context 'when service is inactive' do
+        it { is_expected.not_to validate_presence_of(:project_url) }
+        it { is_expected.not_to validate_presence_of(:issues_url) }
+      end
+
+      context 'when service is active' do
+        before do
+          service.update(active: true)
+        end
+
+        it_behaves_like 'issue tracker service URL attribute', :project_url
+        it_behaves_like 'issue tracker service URL attribute', :issues_url
+        it_behaves_like 'issue tracker service URL attribute', :new_issue_url
+
+        it { is_expected.to validate_presence_of(:project_url) }
+        it { is_expected.to validate_presence_of(:issues_url) }
+      end
+    end
+  end
+end
diff --git a/spec/models/project_services/jira_tracker_data_spec.rb b/spec/models/project_services/jira_tracker_data_spec.rb
new file mode 100644
index 00000000000..1b6ece8531b
--- /dev/null
+++ b/spec/models/project_services/jira_tracker_data_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe JiraTrackerData do
+  let(:service) { create(:jira_service, active: false, properties: {}) }
+
+  describe 'Associations' do
+    it { is_expected.to belong_to(:service) }
+  end
+
+  describe 'Validations' do
+    subject { described_class.new(service: service) }
+
+    context 'jira_issue_transition_id' do
+      it { is_expected.to allow_value(nil).for(:jira_issue_transition_id) }
+      it { is_expected.to allow_value('1,2,3').for(:jira_issue_transition_id) }
+      it { is_expected.to allow_value('1;2;3').for(:jira_issue_transition_id) }
+      it { is_expected.not_to allow_value('a,b,cd').for(:jira_issue_transition_id) }
+    end
+
+    context 'url validations' do
+      context 'when service is inactive' do
+        it { is_expected.not_to validate_presence_of(:url) }
+        it { is_expected.not_to validate_presence_of(:username) }
+        it { is_expected.not_to validate_presence_of(:password) }
+      end
+
+      context 'when service is active' do
+        before do
+          service.update(active: true)
+        end
+
+        it_behaves_like 'issue tracker service URL attribute', :url
+
+        it { is_expected.to validate_presence_of(:url) }
+        it { is_expected.to validate_presence_of(:username) }
+        it { is_expected.to validate_presence_of(:password) }
+      end
+    end
+  end
+end
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 64db32781fe..c9439b0846d 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -6,6 +6,8 @@ describe Service do
   describe "Associations" do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }
+    it { is_expected.to have_one :jira_tracker_data }
+    it { is_expected.to have_one :issue_tracker_data }
   end
 
   describe 'Validations' do