diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-19 17:57:00 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 14:50:42 +0200 |
commit | 37249c1d1a80c1774eb9d4968f58a761a55f28e0 (patch) | |
tree | 337ebf90a186c07d4f37dbfb68a88ea9581d6e74 /spec | |
parent | 305f6efe7818f627e28c6e9d95eb5dbe023fbb92 (diff) | |
download | gitlab-ce-37249c1d1a80c1774eb9d4968f58a761a55f28e0.tar.gz |
Merge branch 'fix-help-paths' into 'master'
Fix help page paths to make sure shortcuts and the UI help page work.
Add a test to make sure the help page UI path doesn't break in the future.
Fixes #19972 and #19889.
cc: @dzaporozhets @rspeicher @lbennett
See merge request !5350
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/help_controller_spec.rb | 9 | ||||
-rw-r--r-- | spec/routing/routing_spec.rb | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb index 267d511c2db..347bef1e129 100644 --- a/spec/controllers/help_controller_spec.rb +++ b/spec/controllers/help_controller_spec.rb @@ -63,4 +63,13 @@ describe HelpController do end end end + + describe 'GET #ui' do + context 'for UI Development Kit' do + it 'renders found' do + get :ui + expect(response).to have_http_status(200) + end + end + end end diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb index 2c755919456..0a52c1ab933 100644 --- a/spec/routing/routing_spec.rb +++ b/spec/routing/routing_spec.rb @@ -116,12 +116,9 @@ describe HelpController, "routing" do expect(get(path)).to route_to('help#show', path: 'workflow/protected_branches/protected_branches1', format: 'png') - path = '/help/shortcuts' - expect(get(path)).to route_to('help#show', - path: 'shortcuts') + path = '/help/ui' - expect(get(path)).to route_to('help#show', - path: 'ui') + expect(get(path)).to route_to('help#ui') end end |