From b17f0b91a66f2101a54dd1efed0c4973f04b1daf Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 12 Oct 2020 15:08:32 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/routing/project_routing_spec.rb | 15 --------------- spec/routing/routing_spec.rb | 15 --------------- 2 files changed, 30 deletions(-) (limited to 'spec/routing') diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb index b04bae3e224..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 diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index 6150a8b26cc..6b7a0d018f1 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -61,12 +61,9 @@ RSpec.describe "Mounted Apps", "routing" do end # snippets GET /snippets(.:format) snippets#index -# POST /snippets(.:format) snippets#create # new_snippet GET /snippets/new(.:format) snippets#new # edit_snippet GET /snippets/:id/edit(.:format) snippets#edit # snippet GET /snippets/:id(.:format) snippets#show -# PUT /snippets/:id(.:format) snippets#update -# DELETE /snippets/:id(.:format) snippets#destroy RSpec.describe SnippetsController, "routing" do it "to #raw" do expect(get("/-/snippets/1/raw")).to route_to('snippets#raw', id: '1') @@ -76,10 +73,6 @@ RSpec.describe SnippetsController, "routing" do expect(get("/-/snippets")).to route_to('snippets#index') end - it "to #create" do - expect(post("/-/snippets")).to route_to('snippets#create') - end - it "to #new" do expect(get("/-/snippets/new")).to route_to('snippets#new') end @@ -92,14 +85,6 @@ RSpec.describe SnippetsController, "routing" do expect(get("/-/snippets/1")).to route_to('snippets#show', id: '1') end - it "to #update" do - expect(put("/-/snippets/1")).to route_to('snippets#update', id: '1') - end - - it "to #destroy" do - expect(delete("/-/snippets/1")).to route_to('snippets#destroy', id: '1') - end - it 'to #show from unscoped routing' do expect(get("/snippets/1")).to route_to('snippets#show', id: '1') end -- cgit v1.2.3