diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-19 15:01:00 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-19 15:01:00 -0800 |
| commit | e3987bb6b150a255a76310cc1eabda8945e2f0cd (patch) | |
| tree | d0409f81453a311fb8994bfd925024fcc5e86c34 | |
| parent | a4bd1f2ae39b7b35b0c47f63d6bbe1315eea63e4 (diff) | |
| parent | d76d8974928c238eed133cced439cbde4dd3239c (diff) | |
| download | gitlab-ce-e3987bb6b150a255a76310cc1eabda8945e2f0cd.tar.gz | |
Merge pull request #8585 from duduribeiro/fix_email_in_ssh_help_page
Fix the email variable substituation in ssh help page
| -rw-r--r-- | app/views/help/show.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/help_pages_spec.rb | 13 |
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..5850a24a420 --- /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 |