Skip to content

Commit 188bc1e

Browse files
committed
Issue #465 rest-service should ignore itself
1 parent 6af3bd0 commit 188bc1e

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

rules/rest-service.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
'use strict';
1212

13-
var utils = require('./utils/utils');
13+
const utils = require('./utils/utils');
1414

1515
module.exports = {
1616
meta: {
@@ -19,9 +19,9 @@ module.exports = {
1919
}]
2020
},
2121
create: function(context) {
22-
var angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider'];
23-
var services = ['$http', '$resource', 'Restangular'];
24-
var message = 'You should use the same service ({{method}}) for REST API calls';
22+
let angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider'];
23+
let services = ['$http', '$resource', 'Restangular'];
24+
let message = 'You should use the same service ({{method}}) for REST API calls';
2525

2626

2727
return {
@@ -46,6 +46,10 @@ module.exports = {
4646
var callee = node.callee;
4747

4848
if (utils.isAngularComponent(node) && callee.type === 'MemberExpression' && angularObjectList.indexOf(callee.property.name) >= 0) {
49+
if (context.options[0] === node.arguments[0].value) {
50+
return;
51+
}
52+
4953
if (utils.isFunctionType(node.arguments[1])) {
5054
checkAllElements(node.arguments[1].params);
5155
}

test/rest-service.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,25 @@
44
// Requirements
55
// ------------------------------------------------------------------------------
66

7-
var rule = require('../rules/rest-service');
8-
var RuleTester = require('eslint').RuleTester;
9-
var commonFalsePositives = require('./utils/commonFalsePositives');
7+
const rule = require('../rules/rest-service');
8+
const RuleTester = require('eslint').RuleTester;
9+
const commonFalsePositives = require('./utils/commonFalsePositives');
1010

1111
// ------------------------------------------------------------------------------
1212
// Tests
1313
// ------------------------------------------------------------------------------
1414

15-
var eslintTester = new RuleTester();
16-
17-
var angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider'];
18-
var possibleValues = ['$http', '$resource', 'Restangular'];
19-
var valid = [];
20-
var invalid = [];
15+
const eslintTester = new RuleTester();
2116

17+
const angularObjectList = ['controller', 'filter', 'directive', 'service', 'factory', 'provider'];
18+
const possibleValues = ['$http', '$resource', 'Restangular'];
19+
let valid = [];
20+
let invalid = [];
2221

22+
valid.push({
23+
code: 'angular.module("name").service("cmnHttpSvc", function($http) {});',
24+
options: ['cmnHttpSvc']
25+
});
2326
angularObjectList.forEach(function(object) {
2427
possibleValues.forEach(function(value) {
2528
valid.push({

0 commit comments

Comments
 (0)