summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2019-02-25 12:43:26 -0800
committerMichael Kozono <mkozono@gmail.com>2019-02-25 12:43:26 -0800
commitea6945b8113160f2009daa854e612eb009690a2a (patch)
treef6312ab4736e0ec355ed7840189267188900f233 /spec/requests
parent9ffdd736f86b053fd02752e7f86f63229aebf602 (diff)
downloadgitlab-ce-ea6945b8113160f2009daa854e612eb009690a2a.tar.gz
Revert "Merge branch 'sh-fix-cpp-templates-404' into 'master'"
This reverts commit 4b282e9ce1ae246c4538b3ede18d1380ea778029, reversing changes made to b6f37434a7022be1be40c0d0519aea3ceca25ea5.
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/project_templates_spec.rb28
1 files changed, 0 insertions, 28 deletions
diff --git a/spec/requests/api/project_templates_spec.rb b/spec/requests/api/project_templates_spec.rb
index 80e5033dab4..ab5d4de7ff7 100644
--- a/spec/requests/api/project_templates_spec.rb
+++ b/spec/requests/api/project_templates_spec.rb
@@ -92,22 +92,6 @@ describe API::ProjectTemplates do
expect(json_response['name']).to eq('Actionscript')
end
- it 'returns C++ gitignore' do
- get api("/projects/#{public_project.id}/templates/gitignores/C++")
-
- expect(response).to have_gitlab_http_status(200)
- expect(response).to match_response_schema('public_api/v4/template')
- expect(json_response['name']).to eq('C++')
- end
-
- it 'returns C++ gitignore for URL-encoded names' do
- get api("/projects/#{public_project.id}/templates/gitignores/C%2B%2B")
-
- expect(response).to have_gitlab_http_status(200)
- expect(response).to match_response_schema('public_api/v4/template')
- expect(json_response['name']).to eq('C++')
- end
-
it 'returns a specific gitlab_ci_yml' do
get api("/projects/#{public_project.id}/templates/gitlab_ci_ymls/Android")
@@ -141,18 +125,6 @@ describe API::ProjectTemplates do
expect(response).to have_gitlab_http_status(200)
expect(response).to match_response_schema('public_api/v4/license')
end
-
- shared_examples 'path traversal attempt' do |template_type|
- it 'rejects invalid filenames' do
- get api("/projects/#{public_project.id}/templates/#{template_type}/%2e%2e%2fPython%2ea")
-
- expect(response).to have_gitlab_http_status(500)
- end
- end
-
- TemplateFinder::VENDORED_TEMPLATES.each do |template_type, _|
- it_behaves_like 'path traversal attempt', template_type
- end
end
describe 'GET /projects/:id/templates/licenses/:key' do