diff options
| -rw-r--r-- | app/views/projects/show.html.haml | 9 | ||||
| -rw-r--r-- | features/steps/project/project.rb | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index d9cff805575..d642690153f 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -44,10 +44,11 @@ - if readme = @repository.readme %article.readme-holder#README .clearfix - %small.pull-right - = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light' do - %i.fa.fa-file - = readme.name + .pull-right + + - if can?(current_user, :push_code, @project) + = link_to namespace_project_edit_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light' do + %i.fa.fa-pencil .wiki = render_readme(readme) - else diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb index b4a0ba1e27f..e8f9a80737f 100644 --- a/features/steps/project/project.rb +++ b/features/steps/project/project.rb @@ -86,13 +86,15 @@ class Spinach::Features::Project < Spinach::FeatureSteps end step 'I should see project "Forum" README' do - expect(page).to have_link 'README.md' - expect(page).to have_content 'Sample repo for testing gitlab features' + page.within('#README') do + expect(page).to have_content 'Sample repo for testing gitlab features' + end end step 'I should see project "Shop" README' do - expect(page).to have_link 'README.md' - expect(page).to have_content 'testme' + page.within('#README') do + expect(page).to have_content 'testme' + end end step 'I add project tags' do |