kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make Ability#project_abilities return unique values and fix counts

Browse source
This commit is contained in:
Stan Hu 2016-08-20 06:33:53 -07:00
parent be95e03a56
commit 1954bb17ec
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/ability.rb
View file

@ -203,7 +203,7 @@ class Ability
rules -= project_archived_rules
end
rules - project_disabled_features_rules(project)
(rules - project_disabled_features_rules(project)).uniq
end
def project_team_rules(team, user)

39
spec/models/ability_spec.rb
View file

@ -191,29 +191,14 @@ describe Ability, lib: true do
admin = create(:admin)
results = described_class.project_abilities(admin, project)
expect(results.count).to eq(90)
expect(results.count).to eq(68)
end
it 'returns permissions for an owner' do
results = described_class.project_abilities(project.owner, project)
expect(results.count).to eq(90)
end
it 'returns permissions for a guest' do
project.team << [user, :guest]
results = described_class.project_abilities(user, project)
expect(results.count).to eq(22)
end
it 'returns permissions for a developer' do
project.team << [user, :developer]
results = described_class.project_abilities(user, project)
expect(results.count).to eq(22)
expect(results.count).to eq(68)
end
it 'returns permissions for a master' do
@ -221,7 +206,23 @@ describe Ability, lib: true do
results = described_class.project_abilities(user, project)
expect(results.count).to eq(22)
expect(results.count).to eq(60)
end
it 'returns permissions for a developer' do
project.team << [user, :developer]
results = described_class.project_abilities(user, project)
expect(results.count).to eq(44)
end
it 'returns permissions for a guest' do
project.team << [user, :guest]
results = described_class.project_abilities(user, project)
expect(results.count).to eq(21)
end
end
end