diff options
author | Stan Hu <stanhu@gmail.com> | 2018-11-17 21:45:05 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-11-19 15:41:41 -0800 |
commit | 2e3674f7a823b391d5d4cb313f01bd95ab7269ec (patch) | |
tree | b32db786e60d2256fbfe36952922897537f23b00 /spec/lib/gitlab/import_export/project_tree_restorer_spec.rb | |
parent | b14057874eee34b14f0a04fcbc4cf81f8dfbf20a (diff) | |
download | gitlab-ce-2e3674f7a823b391d5d4cb313f01bd95ab7269ec.tar.gz |
Prevent templated services from being imported
Templated services should only be created by admins and does not
apply to project import/export.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54189
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 | 9 |
1 files changed, 8 insertions, 1 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 365bfae0d88..7171e12a849 100644 --- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb @@ -297,7 +297,8 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do issues: 1, labels: 1, milestones: 1, - first_issue_labels: 1 + first_issue_labels: 1, + services: 1 context 'project.json file access check' do it 'does not read a symlink' do @@ -382,6 +383,12 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do project_tree_restorer.instance_variable_set(:@path, "spec/lib/gitlab/import_export/project.light.json") end + it 'does not import any templated services' do + restored_project_json + + expect(project.services.where(template: true).count).to eq(0) + end + it 'imports labels' do create(:group_label, name: 'Another label', group: project.group) |