Fix project snippets button appearing when it is disabled

Closes #1705
This commit is contained in:
Stan Hu 2015-05-27 05:07:44 -07:00
parent 4146ce559e
commit ab88b7da19
4 changed files with 15 additions and 1 deletions

View file

@ -115,7 +115,7 @@ class Ability
end end
unless project.snippets_enabled unless project.snippets_enabled
rules -= named_abilities('snippet') rules -= named_abilities('project_snippet')
end end
unless project.wiki_enabled unless project.wiki_enabled

View file

@ -68,3 +68,8 @@ Feature: Project
When I visit project "Shop" page When I visit project "Shop" page
Then I should not see "New Issue" button Then I should not see "New Issue" button
And I should not see "New Merge Request" button And I should not see "New Merge Request" button
Scenario: I should not see Project snippets
Given I disable snippets in project
When I visit project "Shop" page
Then I should not see "Snippets" button

View file

@ -110,4 +110,8 @@ class Spinach::Features::Project < Spinach::FeatureSteps
step 'I should not see "New Merge Request" button' do step 'I should not see "New Merge Request" button' do
page.should_not have_link 'New Merge Request' page.should_not have_link 'New Merge Request'
end end
step 'I should not see "Snippets" button' do
page.should_not have_link 'Snippets'
end
end end

View file

@ -14,6 +14,11 @@ module SharedProject
@project.team << [@user, :master] @project.team << [@user, :master]
end end
step 'I disable snippets in project' do
@project.snippets_enabled = false
@project.save
end
step 'I disable issues and merge requests in project' do step 'I disable issues and merge requests in project' do
@project.issues_enabled = false @project.issues_enabled = false
@project.merge_requests_enabled = false @project.merge_requests_enabled = false