Extra message when trying to ask for roles (#25)

* Fixed issue which caused "who has admin role" to also match adding a
role
* Added test scenario to ensure that this won't happen again

Author: Nick Woodward

src/auth.coffee

@@ -65,14 +65,15 @@ module.exports = (robot) ->
   robot.auth = new Auth
 
   robot.respond /@?([^\s]+) ha(?:s|ve) (["'\w: -_]+) role/i, (msg) ->
-    unless robot.auth.isAdmin msg.message.user
-      msg.reply "Sorry, only admins can assign roles."
-    else
-      name = msg.match[1].trim()
-      if name.toLowerCase() is 'i' then name = msg.message.user.name
-      newRole = msg.match[2].trim().toLowerCase()
+    name = msg.match[1].trim()
+    if name.toLowerCase() is 'i' then name = msg.message.user.name
+
+    unless name.toLowerCase() in ['', 'who', 'what', 'where', 'when', 'why']
+      unless robot.auth.isAdmin msg.message.user
+        msg.reply "Sorry, only admins can assign roles."
+      else
+        newRole = msg.match[2].trim().toLowerCase()
 
-      unless name.toLowerCase() in ['', 'who', 'what', 'where', 'when', 'why']
         user = robot.brain.userForName(name)
         return msg.reply "#{name} does not exist" unless user?
         user.roles or= []
@@ -88,14 +89,15 @@ module.exports = (robot) ->
             msg.reply "OK, #{name} has the '#{newRole}' role."
 
   robot.respond /@?([^\s]+) (?:don['’]t|doesn['’]t|do not) have (["'\w: -_]+) role/i, (msg) ->
-    unless robot.auth.isAdmin msg.message.user
-      msg.reply "Sorry, only admins can remove roles."
-    else
-      name = msg.match[1].trim()
-      if name.toLowerCase() is 'i' then name = msg.message.user.name
-      newRole = msg.match[2].trim().toLowerCase()
+    name = msg.match[1].trim()
+    if name.toLowerCase() is 'i' then name = msg.message.user.name
+
+    unless name.toLowerCase() in ['', 'who', 'what', 'where', 'when', 'why']
+      unless robot.auth.isAdmin msg.message.user
+        msg.reply "Sorry, only admins can remove roles."
+      else
+        newRole = msg.match[2].trim().toLowerCase()
 
-      unless name.toLowerCase() in ['', 'who', 'what', 'where', 'when', 'why']
         user = robot.brain.userForName(name)
         return msg.reply "#{name} does not exist" unless user?
         user.roles or= []

test/auth-test.coffee

@@ -55,6 +55,13 @@ describe 'auth', ->
 
     adapter.receive(new TextMessage admin_user, "hubot: who has admin role?")
 
+  it 'list admin users using non-admin user', (done) ->
+    adapter.on "reply", (envelope, strings) ->
+      expect(strings[0]).to.match /admin-user/i
+      done()
+
+    adapter.receive(new TextMessage anon_user, "hubot: who has admin role?")
+
   it 'anon user fails to set role', (done) ->
     adapter.on "reply", (envelope, strings) ->
       expect(strings[0]).to.match /only admins can assign roles/i