Merge branch 'development' of github.com:Gillespie59/eslint-plugin-angular into development

Author: tilmanschweitzer

rules/controller-name.js

@@ -20,9 +20,9 @@ module.exports = function(context) {
             var callee = node.callee;
             if(callee.type === 'MemberExpression' && callee.property.name === 'controller') {
                 /**
-                * Issue #124 for controller() calls inside karma tests
-                */
-                if(node.arguments.length === 0){
+                 * Allow the usage of element.controller() and element.controller('directiveName') in unittests
+                 */
+                if(node.arguments.length < 2){
                   return;
                 }
 

test/controller-name.js

@@ -29,6 +29,9 @@ eslintTester.run('controller-name', rule, {
     }, {
         code: 'controller = el.controller();',
         options: ['/[A-Z].*Controller$/']
+    }, {
+        code: 'controller = el.controller("no-match");',
+        options: ['/^SpamController$/']
     }],
     invalid: [
         {