Add latest changes from gitlab-org/gitlab@13-2-stable-ee

6 files changed, 7 insertions, 39 deletions

diff --git a/spec/lib/gitlab/import_export/project/export_task_spec.rb b/spec/lib/gitlab/import_export/project/export_task_spec.rb
index dc8eb54dc14..1048379a5d6 100644
--- a/spec/lib/gitlab/import_export/project/export_task_spec.rb
+++ b/spec/lib/gitlab/import_export/project/export_task_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rake_helper'
 
-describe Gitlab::ImportExport::Project::ExportTask do
+RSpec.describe Gitlab::ImportExport::Project::ExportTask do
   let_it_be(:username) { 'root' }
   let(:namespace_path) { username }
   let_it_be(:user) { create(:user, username: username) }
diff --git a/spec/lib/gitlab/import_export/project/import_task_spec.rb b/spec/lib/gitlab/import_export/project/import_task_spec.rb
index 7c11161aaa7..90f4501acdc 100644
--- a/spec/lib/gitlab/import_export/project/import_task_spec.rb
+++ b/spec/lib/gitlab/import_export/project/import_task_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rake_helper'
 
-describe Gitlab::ImportExport::Project::ImportTask, :request_store do
+RSpec.describe Gitlab::ImportExport::Project::ImportTask, :request_store do
   let(:username) { 'root' }
   let(:namespace_path) { username }
   let!(:user) { create(:user, username: username) }
diff --git a/spec/lib/gitlab/import_export/project/object_builder_spec.rb b/spec/lib/gitlab/import_export/project/object_builder_spec.rb
index c9d1410400a..20d882c82be 100644
--- a/spec/lib/gitlab/import_export/project/object_builder_spec.rb
+++ b/spec/lib/gitlab/import_export/project/object_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::ImportExport::Project::ObjectBuilder do
+RSpec.describe Gitlab::ImportExport::Project::ObjectBuilder do
   let!(:group) { create(:group, :private) }
   let!(:subgroup) { create(:group, :private, parent: group) }
   let!(:project) do
diff --git a/spec/lib/gitlab/import_export/project/relation_factory_spec.rb b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
index 3339129cb8f..31cf2362628 100644
--- a/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
+++ b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::ImportExport::Project::RelationFactory do
+RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
   let(:group)   { create(:group) }
   let(:project) { create(:project, :repository, group: group) }
   let(:members_mapper) { double('members_mapper').as_null_object }
diff --git a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
index 867dc37c5c5..6d5604dc40f 100644
--- a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
@@ -6,7 +6,7 @@ def match_mr1_note(content_regex)
   MergeRequest.find_by(title: 'MR1').notes.select { |n| n.note.match(/#{content_regex}/)}.first
 end
 
-describe Gitlab::ImportExport::Project::TreeRestorer do
+RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
   include ImportExport::CommonUtil
   using RSpec::Parameterized::TableSyntax
 
@@ -291,10 +291,6 @@ describe Gitlab::ImportExport::Project::TreeRestorer do
           expect(@project.auto_devops.deploy_strategy).to eq('continuous')
         end
 
-        it 'restores the correct service' do
-          expect(CustomIssueTrackerService.first).not_to be_nil
-        end
-
         it 'restores zoom meetings' do
           meetings = @project.issues.first.zoom_meetings
 
@@ -553,8 +549,7 @@ describe Gitlab::ImportExport::Project::TreeRestorer do
             labels: 2,
             label_with_priorities: 'A project label',
             milestones: 1,
-            first_issue_labels: 1,
-            services: 1
+            first_issue_labels: 1
         end
 
         context 'when there is an existing build with build token' do
@@ -637,7 +632,6 @@ describe Gitlab::ImportExport::Project::TreeRestorer do
           label_with_priorities: 'A project label',
           milestones: 1,
           first_issue_labels: 1,
-          services: 1,
           import_failures: 1
 
         it 'records the failures in the database' do
@@ -757,18 +751,6 @@ describe Gitlab::ImportExport::Project::TreeRestorer do
           setup_reader(reader)
         end
 
-        it 'does not import any templated services' do
-          expect(restored_project_json).to eq(true)
-
-          expect(project.services.where(template: true).count).to eq(0)
-        end
-
-        it 'does not import any instance services' do
-          expect(restored_project_json).to eq(true)
-
-          expect(project.services.where(instance: true).count).to eq(0)
-        end
-
         it 'imports labels' do
           create(:group_label, name: 'Another label', group: project.group)
 
@@ -972,7 +954,6 @@ describe Gitlab::ImportExport::Project::TreeRestorer do
           label_with_priorities: nil,
           milestones: 1,
           first_issue_labels: 0,
-          services: 0,
           import_failures: 1
 
         it 'records the failures in the database' do
diff --git a/spec/lib/gitlab/import_export/project/tree_saver_spec.rb b/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
index 533d1097928..40c103eeda6 100644
--- a/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::ImportExport::Project::TreeSaver do
+RSpec.describe Gitlab::ImportExport::Project::TreeSaver do
   let_it_be(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
   let_it_be(:exportable_path) { 'project' }
 
@@ -223,18 +223,6 @@ describe Gitlab::ImportExport::Project::TreeSaver do
         it { is_expected.not_to be_empty }
       end
 
-      context 'with services' do
-        let(:relation_name) { :services }
-
-        it 'saves the correct service type' do
-          expect(subject.first['type']).to eq('CustomIssueTrackerService')
-        end
-
-        it 'saves the properties for a service' do
-          expect(subject.first['properties']).to eq('one' => 'value')
-        end
-      end
-
       context 'with project_feature' do
         let(:relation_name) { :project_feature }
 
@@ -453,7 +441,6 @@ describe Gitlab::ImportExport::Project::TreeSaver do
     create(:resource_label_event, label: group_label, merge_request: merge_request)
 
     create(:event, :created, target: milestone, project: project, author: user)
-    create(:service, project: project, type: 'CustomIssueTrackerService', category: 'issue_tracker', properties: { one: 'value' })
 
     create(:project_custom_attribute, project: project)
     create(:project_custom_attribute, project: project)