#Issue #446 run method devined in a service can be executed in a angu…

…lar run method
EmmanuelDemey · Mar 18, 2017 · 6768269 · 6768269
1 parent 959693e
commit 6768269
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/rules/utils/false-values.js b/rules/utils/false-values.js
@@ -1,5 +1,6 @@
 'use strict';
 
 module.exports = {
-    config: ['jwtOptionsProvider', 'ngTableHelperProvider', '$ocLazyLoadProvider', '$route', '$localForageProvider']
+    config: [/Provider$/, /$route/],
+    run: [/mocha/, /Service$/]
 };
diff --git a/rules/utils/utils.js b/rules/utils/utils.js
@@ -1,5 +1,6 @@
 'use strict';
 var falseConfigValues = require('./false-values').config;
+var falseRunValues = require('./false-values').run;
 
 var scopeProperties = [
     '$id',
@@ -458,8 +459,7 @@ function isAngularRunSection(node) {
     return isMemberExpression(node.callee) &&
         node.callee.property.type === 'Identifier' &&
         node.callee.property.name === 'run' &&
-        (node.callee.object.type === 'Identifier' &&
-         node.callee.object.name !== 'mocha');
+        !falseRunValues.find(pattern => new RegExp(pattern).test(node.callee.object.name));
 }
 
 /**
@@ -488,7 +488,7 @@ function isAngularConfigSection(node) {
     return isMemberExpression(node.callee) &&
      node.callee.property.type === 'Identifier' &&
      node.callee.property.name === 'config' &&
-     falseConfigValues.indexOf(node.callee.object.name) < 0;
+     !falseConfigValues.find(pattern => new RegExp(pattern).test(node.callee.object.name));
 }
 
 /**

diff --git a/test/module-getter.js b/test/module-getter.js
@@ -23,6 +23,7 @@ eslintTester.run('module-getter', rule, {
         'angular.module("module").config(function(ngTableHelperProvider){' +
             'ngTableHelperProvider.config({count: 10}, {});' +
         '})',
+        'angular.module("module").controller("ctrl", function(ReportService) { ReportService.run();});',
         'angular.module("module").controller("TestCtrl", function() {});',
         'angular.module("module").factory("TestService", function() {});',
         'angular.module("module").service("TestService", function() {});',