Add methods to User model for verifying user roles (#2448)

* Add methods to User model for user roles

* Add a comment

app/models/user.rb

@@ -137,6 +137,19 @@ def has_role(r)
     role == r
   end
 
+  def admin?
+    role == 'admin'
+  end
+
+  def moderator?
+    role == 'moderator'
+  end
+
+  def can_moderate?
+    # use instead of "user.role == 'admin' || user.role == 'moderator'"
+    admin? || moderator?
+  end
+
   def tags(limit = 10)
     Tag.where('name in (?)', tagnames).limit(limit)
   end
@@ -356,4 +369,4 @@ def self.contributor_count_for(start_time,end_time)
     contributors
   end
 
-end
+end

test/unit/user_test.rb

@@ -164,4 +164,19 @@ class UserTest < ActiveSupport::TestCase
     assert_equal 1, drupal_user.user.status
   end
 
+  test 'user roles' do
+    admin = users(:admin)
+    assert admin.admin?
+    assert admin.can_moderate?
+
+    moderator = users(:moderator)
+    assert moderator.moderator?
+    assert moderator.can_moderate?
+
+    basic_user = users(:newcomer)
+    assert_not basic_user.admin?
+    assert_not basic_user.moderator?
+    assert_not basic_user.can_moderate?
+  end
+
 end