Makes user.moderator? return true for administrators
This commit is contained in:
@@ -25,6 +25,6 @@ class User < ActiveRecord::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
def moderator?
|
def moderator?
|
||||||
@is_moderator ||= Moderator.where(user_id: id).exists?
|
@is_moderator ||= Moderator.where(user_id: id).exists? || administrator?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ describe User do
|
|||||||
end
|
end
|
||||||
|
|
||||||
describe "moderator?" do
|
describe "moderator?" do
|
||||||
it "is false when the user is not a moderator" do
|
it "is false when the user is not a moderator nor an administrator" do
|
||||||
expect(subject.moderator?).to be false
|
expect(subject.moderator?).to be false
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -95,6 +95,12 @@ describe User do
|
|||||||
create(:moderator, user: subject)
|
create(:moderator, user: subject)
|
||||||
expect(subject.moderator?).to be true
|
expect(subject.moderator?).to be true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "is true when the user is an administrator" do
|
||||||
|
subject.save
|
||||||
|
create(:administrator, user: subject)
|
||||||
|
expect(subject.moderator?).to be true
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user