consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merges master and fixes conflicts

Browse Source
This commit is contained in:
kikito
2015-08-20 18:50:10 +02:00
parent e7effbf77c 73f5c4e21e
commit ee881230ba
24 changed files with 358 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/models/ability_spec.rb
View File

@@ -100,6 +100,7 @@ describe Ability do
describe "Moderator" do
let(:user) { create(:user) }
before { create(:moderator, user: user) }
let(:other_user) { create(:user) }
it { should be_able_to(:index, Debate) }
it { should be_able_to(:show, debate) }
@@ -124,14 +125,17 @@ describe Ability do
it { should be_able_to(:hide, comment) }
it { should be_able_to(:hide, debate) }
it { should be_able_to(:hide, other_user) }
it { should_not be_able_to(:restore, comment) }
it { should_not be_able_to(:restore, debate) }
it { should_not be_able_to(:restore, other_user) }
end
describe "Administrator" do
let(:user) { create(:user) }
before { create(:administrator, user: user) }
let(:other_user) { create(:user) }
it { should be_able_to(:index, Debate) }
it { should be_able_to(:show, debate) }
@@ -139,5 +143,6 @@ describe Ability do
it { should be_able_to(:restore, comment) }
it { should be_able_to(:restore, debate) }
it { should be_able_to(:restore, other_user) }
end
end