diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb index d2f06ee84..4f54aa4b1 100644 --- a/app/controllers/admin/base_controller.rb +++ b/app/controllers/admin/base_controller.rb @@ -4,8 +4,8 @@ class Admin::BaseController < ApplicationController private - def verify_administrator - raise CanCan::AccessDenied unless current_user.try(:administrator?) - end + def verify_administrator + raise CanCan::AccessDenied unless current_user.try(:administrator?) + end end diff --git a/app/controllers/moderation/base_controller.rb b/app/controllers/moderation/base_controller.rb index 2cebe7320..c8f703225 100644 --- a/app/controllers/moderation/base_controller.rb +++ b/app/controllers/moderation/base_controller.rb @@ -4,8 +4,8 @@ class Moderation::BaseController < ApplicationController private - def verify_moderator - raise CanCan::AccessDenied unless current_user.try(:moderator?) - end + def verify_moderator + raise CanCan::AccessDenied unless current_user.try(:moderator?) || current_user.try(:administrator?) + end end diff --git a/app/models/user.rb b/app/models/user.rb index 931aaae60..4eb832546 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -25,6 +25,6 @@ class User < ActiveRecord::Base end def moderator? - @is_moderator ||= Moderator.where(user_id: id).exists? || administrator? + @is_moderator ||= Moderator.where(user_id: id).exists? end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 9387c2bed..4a8fe8fd7 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -100,7 +100,7 @@ describe User do end describe "moderator?" do - it "is false when the user is not a moderator nor an administrator" do + it "is false when the user is not a moderator" do expect(subject.moderator?).to be false end @@ -109,12 +109,6 @@ describe User do create(:moderator, user: subject) expect(subject.moderator?).to be true 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