Merge pull request #477 from Gillespie59/development

2.4.2

Author: EmmanuelDemey

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-angular",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "ESLint rules for AngularJS projects",
   "main": "index.js",
   "scripts": {

rules/foreach.js

@@ -16,7 +16,7 @@ module.exports = {
     create: function(context) {
         return {
             MemberExpression: function(node) {
-                if (node.object.type === 'Identifier' && node.object.name !== 'angular' && node.property.name === 'forEach') {
+                if (node.object.name !== 'angular' && node.property.name === 'forEach') {
                     context.report(node, 'You should use the angular.forEach method', {});
                 }
             }

rules/rest-service.js

@@ -10,7 +10,7 @@
  */
 'use strict';
 
-var utils = require('./utils/utils');
+const utils = require('./utils/utils');
 
 module.exports = {
     meta: {
@@ -19,9 +19,9 @@ module.exports = {
         }]
     },
     create: function(context) {
-        var angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider'];
-        var services = ['$http', '$resource', 'Restangular'];
-        var message = 'You should use the same service ({{method}}) for REST API calls';
+        let angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider'];
+        let services = ['$http', '$resource', 'Restangular'];
+        let message = 'You should use the same service ({{method}}) for REST API calls';
 
 
         return {
@@ -46,6 +46,10 @@ module.exports = {
                 var callee = node.callee;
 
                 if (utils.isAngularComponent(node) && callee.type === 'MemberExpression' && angularObjectList.indexOf(callee.property.name) >= 0) {
+                    if (context.options[0] === node.arguments[0].value) {
+                        return;
+                    }
+
                     if (utils.isFunctionType(node.arguments[1])) {
                         checkAllElements(node.arguments[1].params);
                     }

test/foreach.js

@@ -18,6 +18,7 @@ eslintTester.run('foreach', rule, {
         'angular.forEach(variable, function() {})'
     ].concat(commonFalsePositives),
     invalid: [
-        {code: 'variable.forEach(function() {})', errors: [{message: 'You should use the angular.forEach method'}]}
+        {code: 'variable.forEach(function() {})', errors: [{message: 'You should use the angular.forEach method'}]},
+        {code: 'a.b.forEach(function() {})', errors: [{message: 'You should use the angular.forEach method'}]}
     ]
 });

test/function-type.js

@@ -14,6 +14,9 @@ var valid = [];
 var invalid = [];
 
 valid.push({
+    code: '_.filter(vm.global, function (n) { return n % 2 === 0; })',
+    options: ['anonymous']
+}, {
     code: 'angular.module("mymodule.constants", []).constant("EMPTY", [])',
     options: ['anonymous']
 }, {

test/rest-service.js

@@ -4,22 +4,25 @@
 // Requirements
 // ------------------------------------------------------------------------------
 
-var rule = require('../rules/rest-service');
-var RuleTester = require('eslint').RuleTester;
-var commonFalsePositives = require('./utils/commonFalsePositives');
+const rule = require('../rules/rest-service');
+const RuleTester = require('eslint').RuleTester;
+const commonFalsePositives = require('./utils/commonFalsePositives');
 
 // ------------------------------------------------------------------------------
 // Tests
 // ------------------------------------------------------------------------------
 
-var eslintTester = new RuleTester();
-
-var angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider'];
-var possibleValues = ['$http', '$resource', 'Restangular'];
-var valid = [];
-var invalid = [];
+const eslintTester = new RuleTester();
 
+const angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider'];
+const possibleValues = ['$http', '$resource', 'Restangular'];
+let valid = [];
+let invalid = [];
 
+valid.push({
+    code: 'angular.module("name").service("cmnHttpSvc", function($http) {});',
+    options: ['cmnHttpSvc']
+});
 angularObjectList.forEach(function(object) {
     possibleValues.forEach(function(value) {
         valid.push({