summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Ribeiro <duduribeiro.gba@gmail.com>2015-01-15 23:06:32 -0200
committerCarlos Ribeiro <duduribeiro.gba@gmail.com>2015-01-15 23:06:32 -0200
commit714ef622644ff478f9538f9b0b4d160d6340214f (patch)
treeb814eb3dab1ecb7866a4ad142fafe0eabb4d7fa4
parent23255bff9913fc1a58c1cf629a2a030c1cbf8a87 (diff)
downloadgitlab-ce-714ef622644ff478f9538f9b0b4d160d6340214f.tar.gz
Fix the email variable substituation in ssh help page
-rw-r--r--app/views/help/show.html.haml2
-rw-r--r--spec/features/help_pages_spec.rb13
2 files changed, 14 insertions, 1 deletions
diff --git a/app/views/help/show.html.haml b/app/views/help/show.html.haml
index 67f9cc41cf3..eca34dbff06 100644
--- a/app/views/help/show.html.haml
+++ b/app/views/help/show.html.haml
@@ -1,2 +1,2 @@
.documentation.wiki
- = markdown File.read(Rails.root.join('doc', @category, @file + '.md'))
+ = markdown File.read(Rails.root.join('doc', @category, @file + '.md')).gsub("$your_email", current_user.email)
diff --git a/spec/features/help_pages_spec.rb b/spec/features/help_pages_spec.rb
new file mode 100644
index 00000000000..fe73be6519c
--- /dev/null
+++ b/spec/features/help_pages_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "Help Pages", feature: true do
+ describe "Show SSH page" do
+ before 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: "ssh.md")
+ page.should have_content("ssh-keygen -t rsa -C \"#{@user.email}\"")
+ end
+ end
+end