Merge pull request #205 from Gillespie59/development

0.10.1

Author: EmmanuelDemey

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-angular",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "ESLint rules for AngularJS projects",
   "main": "index.js",
   "repository": {
@@ -16,13 +16,13 @@
   "devDependencies": {
     "chai": "^3.2.0",
     "coveralls": "^2.11.4",
-    "eslint": "^1.1.0",
+    "eslint": "^1.3.1",
     "gulp": "^3.9.0",
     "gulp-eslint": "^1.0.0",
     "gulp-istanbul": "^0.10.0",
     "gulp-mocha": "^2.1.3",
-    "istanbul": "^0.3.17",
-    "mocha": "^2.2.5",
+    "istanbul": "^0.3.19",
+    "mocha": "^2.3.0",
     "shelljs": "^0.5.3",
     "shelljs-nodecli": "^0.1.1"
   },

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: [
         {