Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions rules/utils/angular-rule.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,6 @@ function angularRule(ruleDefinition) {
function findFunctionByNode(callExpressionNode, scope) {
var node;
if (callExpressionNode.callee.type === 'Identifier') {
if (callExpressionNode.callee.name !== 'inject') {
return;
}
node = callExpressionNode.arguments[0];
} else if (callExpressionNode.callee.property.name === 'run' || callExpressionNode.callee.property.name === 'config') {
node = callExpressionNode.arguments[0];
Expand Down
10 changes: 10 additions & 0 deletions test/component-limit.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,17 @@ eslintTester.run('component-limit', rule, {
'angular.module("").factory();',
'angular.module("").filter();',
'angular.module("").provider();',
'angular.module("").run();',
'angular.module("").service();',
'angular.module("").animation("", "");',
'angular.module("").config("");',
'angular.module("").controller("", "");',
'angular.module("").directive("", "");',
'angular.module("").factory("", "");',
'angular.module("").filter("", "");',
'angular.module("").provider("", "");',
'angular.module("").run("");',
'angular.module("").service("", "");',
// Identified potential false positives
'$scope.$on("", function() {});$scope.$on("", function() {});',
'app.service("", function(myService) { var data = {}; myService.someMethod("", data); });',
Expand Down
10 changes: 10 additions & 0 deletions test/di-order.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@ eslintTester.run('di-order', rule, {
'inject(function($http, $q) {});',
'it(inject(function($http, $q) {}));',
'it(inject(function(_$http_, _$httpBackend_) {}));',
// Potential crashes
'angular.module("").animation("", "");',
'angular.module("").config("");',
'angular.module("").controller("", "");',
'angular.module("").directive("", "");',
'angular.module("").factory("", "");',
'angular.module("").filter("", "");',
'angular.module("").provider("", "");',
'angular.module("").run("");',
'angular.module("").service("", "");',
{
code: 'it(inject(function(_$httpBackend_, _$http_) {}));',
options: [false]
Expand Down
12 changes: 11 additions & 1 deletion test/di-unused.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,17 @@ eslintTester.run('di-unused', rule, {
'angular.module("").run(["$q", function($q) {return $q;}]);',
'inject(function($q) {_$q_ = $q;});',
'angular.module("").provider("", function() {this.$get = function($q) {return $q};});',
'angular.module("").provider("", function() {this.$get = ["$q", function($q) {return $q}];});'
'angular.module("").provider("", function() {this.$get = ["$q", function($q) {return $q}];});',
// Potential crashes
'angular.module("").animation("", "");',
'angular.module("").config("");',
'angular.module("").controller("", "");',
'angular.module("").directive("", "");',
'angular.module("").factory("", "");',
'angular.module("").filter("", "");',
'angular.module("").provider("", "");',
'angular.module("").run("");',
'angular.module("").service("", "");'
].concat(commonFalsePositives),
invalid: [
// animation
Expand Down
12 changes: 11 additions & 1 deletion test/no-run-logic.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,17 @@ eslintTester.run('no-run-logic', rule, {
'angular.module("").run(function() {foo(null)});',
'angular.module("").run(function() {foo(undefined)});',
'angular.module("").run(function() {foo("bar")});',
'angular.module("").run(function() {foo(bar)});'
'angular.module("").run(function() {foo(bar)});',
// don't crash on component definitions
'angular.module("").animation();',
'angular.module("").config();',
'angular.module("").controller();',
'angular.module("").directive();',
'angular.module("").factory();',
'angular.module("").filter();',
'angular.module("").provider();',
'angular.module("").run();',
'angular.module("").service();'
],
invalid: [
// Nested function declarations
Expand Down