diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /spec/routing | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'spec/routing')
-rw-r--r-- | spec/routing/admin_routing_spec.rb | 6 | ||||
-rw-r--r-- | spec/routing/group_routing_spec.rb | 4 | ||||
-rw-r--r-- | spec/routing/instance_statistics_routing_spec.rb | 11 | ||||
-rw-r--r-- | spec/routing/project_routing_spec.rb | 21 | ||||
-rw-r--r-- | spec/routing/routing_spec.rb | 29 |
5 files changed, 28 insertions, 43 deletions
diff --git a/spec/routing/admin_routing_spec.rb b/spec/routing/admin_routing_spec.rb index fedafff0d1b..9374df0c4a2 100644 --- a/spec/routing/admin_routing_spec.rb +++ b/spec/routing/admin_routing_spec.rb @@ -184,3 +184,9 @@ RSpec.describe Admin::PlanLimitsController, "routing" do expect(post("/admin/plan_limits")).to route_to('admin/plan_limits#create') end end + +RSpec.describe Admin::RunnersController, "routing" do + it "to #runner_setup_scripts" do + expect(get("/admin/runners/runner_setup_scripts")).to route_to('admin/runners#runner_setup_scripts') + end +end diff --git a/spec/routing/group_routing_spec.rb b/spec/routing/group_routing_spec.rb index f4d5f899519..9de99b73d23 100644 --- a/spec/routing/group_routing_spec.rb +++ b/spec/routing/group_routing_spec.rb @@ -43,6 +43,10 @@ RSpec.shared_examples 'groups routing' do expect(get("/groups/#{group_path}/-/milestones")).to route_to('groups/milestones#index', group_id: group_path) end + it "to #runner_setup_scripts" do + expect(get("/groups/#{group_path}/-/settings/ci_cd/runner_setup_scripts")).to route_to('groups/settings/ci_cd#runner_setup_scripts', group_id: group_path) + end + it 'routes to the avatars controller' do expect(delete("/groups/#{group_path}/-/avatar")) .to route_to(group_id: group_path, diff --git a/spec/routing/instance_statistics_routing_spec.rb b/spec/routing/instance_statistics_routing_spec.rb deleted file mode 100644 index 7eec807fb0b..00000000000 --- a/spec/routing/instance_statistics_routing_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe 'Instance Statistics', 'routing' do - include RSpec::Rails::RequestExampleGroup - - it "routes '/-/instance_statistics' to dev ops report" do - expect(get('/-/instance_statistics')).to redirect_to('/admin/dev_ops_report') - end -end 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) diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index 722e687838f..f665dc31ee4 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 @@ -119,9 +104,9 @@ RSpec.describe HelpController, "routing" do path: 'user/markdown', format: 'md') - path = '/help/workflow/protected_branches/protected_branches1.png' + path = '/help/user/markdown/markdown_logo.png' expect(get(path)).to route_to('help#show', - path: 'workflow/protected_branches/protected_branches1', + path: 'user/markdown/markdown_logo', format: 'png') end end @@ -148,6 +133,10 @@ RSpec.describe ProfilesController, "routing" do it "to #show" do expect(get("/profile")).to route_to('profiles#show') end + + it 'to #show from scope routing' do + expect(get("/-/profile")).to route_to('profiles#show') + end end # profile_preferences GET /profile/preferences(.:format) profiles/preferences#show @@ -374,3 +363,9 @@ RSpec.describe Snippets::BlobsController, "routing" do .to route_to('snippets/blobs#raw', snippet_id: '1', ref: 'master', path: 'lib/version.rb') end end + +RSpec.describe RunnerSetupController, 'routing' do + it 'to #platforms' do + expect(get("/-/runner_setup/platforms")).to route_to('runner_setup#platforms') + end +end |