Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSullivan SENECHAL <soullivaneuh@gmail.com>2014-10-07 16:06:05 +0400
committerSullivan SENECHAL <sullivan@nexylan.com>2015-04-03 12:56:50 +0300
commitd365004e684e98459061fcd5fbaf9bea880934a8 (patch)
tree0a2961445ed5b23e97ed2c7f676bf6bf76a09e78 /spec
parent0d0042d27481d31027a10edb2ba3a184bff5075a (diff)
Fix and improve help rendering
Diffstat (limited to 'spec')
-rw-r--r--spec/features/help_pages_spec.rb2
-rw-r--r--spec/routing/routing_spec.rb38
2 files changed, 20 insertions, 20 deletions
diff --git a/spec/features/help_pages_spec.rb b/spec/features/help_pages_spec.rb
index 41088ce8271..28423eb8caa 100644
--- a/spec/features/help_pages_spec.rb
+++ b/spec/features/help_pages_spec.rb
@@ -6,7 +6,7 @@ describe 'Help Pages', feature: true do
login_as :user
end
it 'replace the variable $your_email with the email of the user' do
- visit help_page_path(category: 'ssh', file: 'README.md')
+ visit help_page_path(filepath: 'ssh/README', format: 'md')
expect(page).to have_content("ssh-keygen -t rsa -C \"#{@user.email}\"")
end
end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index d4915b51952..f5db548f97c 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -73,41 +73,41 @@ end
# help_markdown GET /help/markdown(.:format) help#markdown
# help_ssh GET /help/ssh(.:format) help#ssh
# help_raketasks GET /help/raketasks(.:format) help#raketasks
-describe HelpController, "routing" do
- it "to #index" do
- expect(get("/help")).to route_to('help#index')
+describe HelpController, 'routing' do
+ it 'to #index' do
+ expect(get('/help')).to route_to('help#index')
end
- it "to #permissions" do
- expect(get("/help/permissions/permissions")).to route_to('help#show', category: "permissions", file: "permissions")
+ it 'to #permissions' do
+ expect(get('/help/permissions/permissions')).to route_to('help#show', filepath: 'permissions/permissions')
end
- it "to #workflow" do
- expect(get("/help/workflow/README")).to route_to('help#show', category: "workflow", file: "README")
+ it 'to #workflow' do
+ expect(get('/help/workflow/README')).to route_to('help#show', filepath: 'workflow/README')
end
- it "to #api" do
- expect(get("/help/api/README")).to route_to('help#show', category: "api", file: "README")
+ it 'to #api' do
+ expect(get('/help/api/README')).to route_to('help#show', filepath: 'api/README')
end
- it "to #web_hooks" do
- expect(get("/help/web_hooks/web_hooks")).to route_to('help#show', category: "web_hooks", file: "web_hooks")
+ it 'to #web_hooks' do
+ expect(get('/help/web_hooks/web_hooks')).to route_to('help#show', filepath: 'web_hooks/web_hooks')
end
- it "to #system_hooks" do
- expect(get("/help/system_hooks/system_hooks")).to route_to('help#show', category: "system_hooks", file: "system_hooks")
+ it 'to #system_hooks' do
+ expect(get('/help/system_hooks/system_hooks')).to route_to('help#show', filepath: 'system_hooks/system_hooks')
end
- it "to #markdown" do
- expect(get("/help/markdown/markdown")).to route_to('help#show',category: "markdown", file: "markdown")
+ it 'to #markdown' do
+ expect(get('/help/markdown/markdown')).to route_to('help#show',filepath: 'markdown/markdown')
end
- it "to #ssh" do
- expect(get("/help/ssh/README")).to route_to('help#show', category: "ssh", file: "README")
+ it 'to #ssh' do
+ expect(get('/help/ssh/README')).to route_to('help#show', filepath: 'ssh/README')
end
- it "to #raketasks" do
- expect(get("/help/raketasks/README")).to route_to('help#show', category: "raketasks", file: "README")
+ it 'to #raketasks' do
+ expect(get('/help/raketasks/README')).to route_to('help#show', filepath: 'raketasks/README')
end
end