Undo user.moderator? returning true for admins

app/controllers/admin/base_controller.rb

@@ -4,8 +4,8 @@ class Admin::BaseController < ApplicationController
 
   private
 
-  def verify_administrator
+    def verify_administrator
-    raise CanCan::AccessDenied unless current_user.try(:administrator?)
+      raise CanCan::AccessDenied unless current_user.try(:administrator?)
-  end
+    end
 
 end

app/controllers/moderation/base_controller.rb

@@ -4,8 +4,8 @@ class Moderation::BaseController < ApplicationController
 
   private
 
-  def verify_moderator
+    def verify_moderator
-    raise CanCan::AccessDenied unless current_user.try(:moderator?)
+      raise CanCan::AccessDenied unless current_user.try(:moderator?) || current_user.try(:administrator?)
-  end
+    end
 
 end

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

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