diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/lib/gitlab/import_export/project/tree_restorer_spec.rb | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/lib/gitlab/import_export/project/tree_restorer_spec.rb')
-rw-r--r-- | spec/lib/gitlab/import_export/project/tree_restorer_spec.rb | 23 |
1 files changed, 2 insertions, 21 deletions
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 |