Add latest changes from gitlab-org/gitlab@master

6 files changed, 3 insertions, 328 deletions

diff --git a/spec/models/project_services/bugzilla_service_spec.rb b/spec/models/project_services/bugzilla_service_spec.rb
index ab939e0d2f8..6818db48fee 100644
--- a/spec/models/project_services/bugzilla_service_spec.rb
+++ b/spec/models/project_services/bugzilla_service_spec.rb
@@ -32,49 +32,4 @@ describe BugzillaService do
       it { is_expected.not_to validate_presence_of(:new_issue_url) }
     end
   end
-
-  context 'overriding properties' do
-    let(:url) { 'http://bugzilla.example.com' }
-    let(:access_params) do
-      { project_url: url, issues_url: url, new_issue_url: url }
-    end
-
-    # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
-    context 'when data are stored in properties' do
-      let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) do
-        create(:bugzilla_service, :without_properties_callback, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in separated fields' do
-      let(:service) do
-        create(:bugzilla_service, title: title, description: description, properties: access_params)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in both properties and separated fields' do
-      let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
-      let(:service) do
-        create(:bugzilla_service, :without_properties_callback, title: title, description: description, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when no title & description are set' do
-      let(:service) do
-        create(:bugzilla_service, properties: access_params)
-      end
-
-      it 'returns default values' do
-        expect(service.title).to eq('Bugzilla')
-        expect(service.description).to eq('Bugzilla issue tracker')
-      end
-    end
-  end
 end
diff --git a/spec/models/project_services/custom_issue_tracker_service_spec.rb b/spec/models/project_services/custom_issue_tracker_service_spec.rb
index e749ea6eacc..f2232ae8e9a 100644
--- a/spec/models/project_services/custom_issue_tracker_service_spec.rb
+++ b/spec/models/project_services/custom_issue_tracker_service_spec.rb
@@ -31,66 +31,5 @@ describe CustomIssueTrackerService do
       it { is_expected.not_to validate_presence_of(:issues_url) }
       it { is_expected.not_to validate_presence_of(:new_issue_url) }
     end
-
-    context 'title' do
-      let(:issue_tracker) { described_class.new(properties: {}) }
-
-      it 'sets a default title' do
-        issue_tracker.title = nil
-
-        expect(issue_tracker.title).to eq('Custom Issue Tracker')
-      end
-
-      it 'sets the custom title' do
-        issue_tracker.title = 'test title'
-
-        expect(issue_tracker.title).to eq('test title')
-      end
-    end
-  end
-
-  context 'overriding properties' do
-    let(:url) { 'http://custom.example.com' }
-    let(:access_params) do
-      { project_url: url, issues_url: url, new_issue_url: url }
-    end
-
-    # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
-    context 'when data are stored in properties' do
-      let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) do
-        create(:custom_issue_tracker_service, :without_properties_callback, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in separated fields' do
-      let(:service) do
-        create(:custom_issue_tracker_service, title: title, description: description, properties: access_params)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in both properties and separated fields' do
-      let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
-      let(:service) do
-        create(:custom_issue_tracker_service, :without_properties_callback, title: title, description: description, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when no title & description are set' do
-      let(:service) do
-        create(:custom_issue_tracker_service, properties: access_params)
-      end
-
-      it 'returns default values' do
-        expect(service.title).to eq('Custom Issue Tracker')
-        expect(service.description).to eq('Custom issue tracker')
-      end
-    end
   end
 end
diff --git a/spec/models/project_services/gitlab_issue_tracker_service_spec.rb b/spec/models/project_services/gitlab_issue_tracker_service_spec.rb
index 7f1c6224b7d..ba861aefe3c 100644
--- a/spec/models/project_services/gitlab_issue_tracker_service_spec.rb
+++ b/spec/models/project_services/gitlab_issue_tracker_service_spec.rb
@@ -51,49 +51,4 @@ describe GitlabIssueTrackerService do
       end
     end
   end
-
-  context 'overriding properties' do
-    let(:url) { 'http://gitlab.example.com' }
-    let(:access_params) do
-      { project_url: url, issues_url: url, new_issue_url: url }
-    end
-
-    # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
-    context 'when data are stored in properties' do
-      let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) do
-        create(:gitlab_issue_tracker_service, :without_properties_callback, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in separated fields' do
-      let(:service) do
-        create(:gitlab_issue_tracker_service, title: title, description: description, properties: access_params)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in both properties and separated fields' do
-      let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
-      let(:service) do
-        create(:gitlab_issue_tracker_service, :without_properties_callback, title: title, description: description, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when no title & description are set' do
-      let(:service) do
-        create(:gitlab_issue_tracker_service, properties: access_params)
-      end
-
-      it 'returns default values' do
-        expect(service.title).to eq('GitLab')
-        expect(service.description).to eq('GitLab issue tracker')
-      end
-    end
-  end
 end
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index 20e85f0fd4b..5e2dd5f3fc9 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -5,8 +5,6 @@ require 'spec_helper'
 describe JiraService do
   include AssetsHelpers
 
-  let(:title) { 'custom title' }
-  let(:description) { 'custom description' }
   let(:url) { 'http://jira.example.com' }
   let(:api_url) { 'http://api-jira.example.com' }
   let(:username) { 'jira-username' }
@@ -93,7 +91,6 @@ describe JiraService do
     let(:params) do
       {
         project: create(:project),
-        title: 'custom title', description: 'custom description',
         url: url, api_url: api_url,
         username: username, password: password,
         jira_issue_transition_id: transition_id
@@ -106,19 +103,6 @@ describe JiraService do
       expect(subject.properties).to be_nil
     end
 
-    it 'sets title correctly' do
-      service = subject
-
-      expect(service.title).to eq('custom title')
-    end
-
-    it 'sets service data correctly' do
-      service = subject
-
-      expect(service.title).to eq('custom title')
-      expect(service.description).to eq('custom description')
-    end
-
     it 'stores data in data_fields correcty' do
       service = subject
 
@@ -209,7 +193,6 @@ describe JiraService do
               end
 
               it 'does not reset password if url "changed" to the same url as before' do
-                service.title = 'aaaaaa'
                 service.url = 'http://jira.example.com'
                 service.save
 
@@ -318,46 +301,32 @@ describe JiraService do
 
     # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
     context 'when data are stored in properties' do
-      let(:properties) { data_params.merge(title: title, description: description) }
+      let(:properties) { data_params }
       let!(:service) do
         create(:jira_service, :without_properties_callback, properties: properties.merge(additional: 'something'))
       end
 
-      it_behaves_like 'issue tracker fields'
       it_behaves_like 'handles jira fields'
     end
 
     context 'when data are stored in separated fields' do
       let(:service) do
-        create(:jira_service, data_params.merge(properties: {}, title: title, description: description))
+        create(:jira_service, data_params.merge(properties: {}))
       end
 
-      it_behaves_like 'issue tracker fields'
       it_behaves_like 'handles jira fields'
     end
 
     context 'when data are stored in both properties and separated fields' do
-      let(:properties) { data_params.merge(title: title, description: description) }
+      let(:properties) { data_params }
       let(:service) do
         create(:jira_service, :without_properties_callback, active: false, properties: properties).tap do |service|
           create(:jira_tracker_data, data_params.merge(service: service))
         end
       end
 
-      it_behaves_like 'issue tracker fields'
       it_behaves_like 'handles jira fields'
     end
-
-    context 'when no title & description are set' do
-      let(:service) do
-        create(:jira_service, properties: access_params)
-      end
-
-      it 'returns default values' do
-        expect(service.title).to eq('Jira')
-        expect(service.description).to eq(s_('JiraService|Jira issue tracker'))
-      end
-    end
   end
 
   describe '#close_issue' do
@@ -704,59 +673,6 @@ describe JiraService do
     end
   end
 
-  describe 'description and title' do
-    let(:title) { 'Jira One' }
-    let(:description) { 'Jira One issue tracker' }
-    let(:properties) do
-      {
-        url: 'http://jira.example.com/web',
-        username: 'mic',
-        password: 'password',
-        title: title,
-        description: description
-      }
-    end
-
-    context 'when it is not set' do
-      it 'default values are returned' do
-        service = create(:jira_service)
-
-        expect(service.title).to eq('Jira')
-        expect(service.description).to eq(s_('JiraService|Jira issue tracker'))
-      end
-    end
-
-    context 'when it is set in properties' do
-      it 'values from properties are returned' do
-        service = create(:jira_service, :without_properties_callback, properties: properties)
-
-        expect(service.title).to eq(title)
-        expect(service.description).to eq(description)
-      end
-    end
-
-    context 'when it is in title & description fields' do
-      it 'values from title and description fields are returned' do
-        service = create(:jira_service, title: title, description: description)
-
-        expect(service.title).to eq(title)
-        expect(service.description).to eq(description)
-      end
-    end
-
-    context 'when it is in both properites & title & description fields' do
-      it 'values from title and description fields are returned' do
-        title2 = 'Jira 2'
-        description2 = 'Jira description 2'
-
-        service = create(:jira_service, title: title2, description: description2, properties: properties)
-
-        expect(service.title).to eq(title2)
-        expect(service.description).to eq(description2)
-      end
-    end
-  end
-
   describe 'project and issue urls' do
     context 'when gitlab.yml was initialized' do
       it 'is prepopulated with the settings' do
diff --git a/spec/models/project_services/redmine_service_spec.rb b/spec/models/project_services/redmine_service_spec.rb
index 6220d7b1fac..4024de38505 100644
--- a/spec/models/project_services/redmine_service_spec.rb
+++ b/spec/models/project_services/redmine_service_spec.rb
@@ -50,49 +50,4 @@ describe RedmineService do
       expect(described_class.reference_pattern.match('#123')[:issue]).to eq('123')
     end
   end
-
-  context 'overriding properties' do
-    let(:url) { 'http://redmine.example.com' }
-    let(:access_params) do
-      { project_url: url, issues_url: url, new_issue_url: url }
-    end
-
-    # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
-    context 'when data are stored in properties' do
-      let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) do
-        create(:redmine_service, :without_properties_callback, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in separated fields' do
-      let(:service) do
-        create(:redmine_service, title: title, description: description, properties: access_params)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in both properties and separated fields' do
-      let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
-      let(:service) do
-        create(:redmine_service, :without_properties_callback, title: title, description: description, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when no title & description are set' do
-      let(:service) do
-        create(:redmine_service, properties: access_params)
-      end
-
-      it 'returns default values' do
-        expect(service.title).to eq('Redmine')
-        expect(service.description).to eq('Redmine issue tracker')
-      end
-    end
-  end
 end
diff --git a/spec/models/project_services/youtrack_service_spec.rb b/spec/models/project_services/youtrack_service_spec.rb
index b8fff635e99..c82a3cc1bcf 100644
--- a/spec/models/project_services/youtrack_service_spec.rb
+++ b/spec/models/project_services/youtrack_service_spec.rb
@@ -42,49 +42,4 @@ describe YoutrackService do
       expect(described_class.reference_pattern.match('yt-123')[:issue]).to eq('yt-123')
     end
   end
-
-  context 'overriding properties' do
-    let(:url) { 'http://youtrack.example.com' }
-    let(:access_params) do
-      { project_url: url, issues_url: url, new_issue_url: url }
-    end
-
-    # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
-    context 'when data are stored in properties' do
-      let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) do
-        create(:youtrack_service, :without_properties_callback, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in separated fields' do
-      let(:service) do
-        create(:youtrack_service, title: title, description: description, properties: access_params)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when data are stored in both properties and separated fields' do
-      let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
-      let(:service) do
-        create(:youtrack_service, :without_properties_callback, title: title, description: description, properties: properties)
-      end
-
-      it_behaves_like 'issue tracker fields'
-    end
-
-    context 'when no title & description are set' do
-      let(:service) do
-        create(:youtrack_service, properties: access_params)
-      end
-
-      it 'returns default values' do
-        expect(service.title).to eq('YouTrack')
-        expect(service.description).to eq(s_('IssueTracker|YouTrack issue tracker'))
-      end
-    end
-  end
 end