Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 6 insertions, 15 deletions

diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index b80baf0aa13..a683dc28f4f 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -306,12 +306,9 @@ RSpec.describe 'project routing' do
   end
   #  raw_project_snippet GET    /:project_id/snippets/:id/raw(.:format)  snippets#raw
   #     project_snippets GET    /:project_id/snippets(.:format)          snippets#index
-  #                      POST   /:project_id/snippets(.:format)          snippets#create
   #  new_project_snippet GET    /:project_id/snippets/new(.:format)      snippets#new
   # edit_project_snippet GET    /:project_id/snippets/:id/edit(.:format) snippets#edit
   #      project_snippet GET    /:project_id/snippets/:id(.:format)      snippets#show
-  #                      PUT    /:project_id/snippets/:id(.:format)      snippets#update
-  #                      DELETE /:project_id/snippets/:id(.:format)      snippets#destroy
   describe SnippetsController, 'routing' do
     it 'to #raw' do
       expect(get('/gitlab/gitlabhq/-/snippets/1/raw')).to route_to('projects/snippets#raw', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
@@ -321,10 +318,6 @@ RSpec.describe 'project routing' do
       expect(get('/gitlab/gitlabhq/-/snippets')).to route_to('projects/snippets#index', namespace_id: 'gitlab', project_id: 'gitlabhq')
     end
 
-    it 'to #create' do
-      expect(post('/gitlab/gitlabhq/-/snippets')).to route_to('projects/snippets#create', namespace_id: 'gitlab', project_id: 'gitlabhq')
-    end
-
     it 'to #new' do
       expect(get('/gitlab/gitlabhq/-/snippets/new')).to route_to('projects/snippets#new', namespace_id: 'gitlab', project_id: 'gitlabhq')
     end
@@ -337,14 +330,6 @@ RSpec.describe 'project routing' do
       expect(get('/gitlab/gitlabhq/-/snippets/1')).to route_to('projects/snippets#show', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
     end
 
-    it 'to #update' do
-      expect(put('/gitlab/gitlabhq/-/snippets/1')).to route_to('projects/snippets#update', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
-    end
-
-    it 'to #destroy' do
-      expect(delete('/gitlab/gitlabhq/-/snippets/1')).to route_to('projects/snippets#destroy', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
-    end
-
     it 'to #show from unscope routing' do
       expect(get('/gitlab/gitlabhq/snippets/1')).to route_to('projects/snippets#show', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
     end
@@ -731,6 +716,12 @@ RSpec.describe 'project routing' do
     end
   end
 
+  describe Projects::Settings::CiCdController, 'routing' do
+    it "to #runner_setup_scripts" do
+      expect(get("/gitlab/gitlabhq/-/settings/ci_cd/runner_setup_scripts")).to route_to('projects/settings/ci_cd#runner_setup_scripts', namespace_id: 'gitlab', project_id: 'gitlabhq')
+    end
+  end
+
   describe Projects::TemplatesController, 'routing' do
     describe '#show' do
       def show_with_template_type(template_type)