From 714ef622644ff478f9538f9b0b4d160d6340214f Mon Sep 17 00:00:00 2001 From: Carlos Ribeiro Date: Thu, 15 Jan 2015 23:06:32 -0200 Subject: [PATCH 1/2] Fix the email variable substituation in ssh help page --- app/views/help/show.html.haml | 2 +- spec/features/help_pages_spec.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 spec/features/help_pages_spec.rb 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 From d76d8974928c238eed133cced439cbde4dd3239c Mon Sep 17 00:00:00 2001 From: Carlos Ribeiro Date: Sun, 18 Jan 2015 14:21:18 -0200 Subject: [PATCH 2/2] Change to single-quoted strings in help_pages_spec --- spec/features/help_pages_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/features/help_pages_spec.rb b/spec/features/help_pages_spec.rb index fe73be6519c..5850a24a420 100644 --- a/spec/features/help_pages_spec.rb +++ b/spec/features/help_pages_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' -describe "Help Pages", feature: true do - describe "Show SSH page" do +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") + 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