diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-02-26 01:01:58 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-02-26 01:01:58 +0000 |
commit | 4a5b3707798c2dde62dd78c40b8f0393b38c8041 (patch) | |
tree | 1f73d09424cb5ca929a3cde97cc873e997369f86 /spec/requests/api/project_templates_spec.rb | |
parent | 44cc030574593dc72514f22b453eb966751b9b78 (diff) | |
parent | cae2c336819d1838507b0c5d21c609710b21ac4f (diff) | |
download | gitlab-ce-4a5b3707798c2dde62dd78c40b8f0393b38c8041.tar.gz |
Merge branch 'revert-82d7b5a0-ce' into 'master'
[CE port] Revert "Automatic merge of gitlab-org/gitlab-ce master"
See merge request gitlab-org/gitlab-ce!25537
Diffstat (limited to 'spec/requests/api/project_templates_spec.rb')
-rw-r--r-- | spec/requests/api/project_templates_spec.rb | 28 |
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 |