summaryrefslogtreecommitdiff
path: root/spec/routing
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-11 16:11:33 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-11 16:11:33 -0600
commitc30b3257818b6106c08e5d454e14b972d95450fa (patch)
tree17e4ba8060a3af408f1f506fc56edab0426dc5ec /spec/routing
parentbd09b2d563d7190ab26f820401e4d981022022c8 (diff)
downloadgitlab-ce-c30b3257818b6106c08e5d454e14b972d95450fa.tar.gz
Fix failing tests.
Diffstat (limited to 'spec/routing')
-rw-r--r--spec/routing/routing_spec.rb22
1 files changed, 9 insertions, 13 deletions
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 8a8e131c57b..2c755919456 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -98,7 +98,7 @@ describe SnippetsController, "routing" do
end
# help GET /help(.:format) help#index
-# help_page GET /help/:category/:file(.:format) help#show {:category=>/.*/, :file=>/[^\/\.]+/}
+# help_page GET /help/*path(.:format) help#show
# help_shortcuts GET /help/shortcuts(.:format) help#shortcuts
# help_ui GET /help/ui(.:format) help#ui
describe HelpController, "routing" do
@@ -109,23 +109,19 @@ describe HelpController, "routing" do
it 'to #show' do
path = '/help/markdown/markdown.md'
expect(get(path)).to route_to('help#show',
- category: 'markdown',
- file: 'markdown',
+ path: 'markdown/markdown',
format: 'md')
path = '/help/workflow/protected_branches/protected_branches1.png'
expect(get(path)).to route_to('help#show',
- category: 'workflow/protected_branches',
- file: 'protected_branches1',
+ path: 'workflow/protected_branches/protected_branches1',
format: 'png')
- end
-
- it 'to #shortcuts' do
- expect(get('/help/shortcuts')).to route_to('help#shortcuts')
- end
-
- it 'to #ui' do
- expect(get('/help/ui')).to route_to('help#ui')
+ 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')
end
end