Merge pull request #475 from Gillespie59/development

2.4.1

Author: EmmanuelDemey

package.json

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

rules/file-name.js

@@ -122,7 +122,7 @@ module.exports = {
 
             return {
                 CallExpression: function(node) {
-                    if (utils.isAngularComponent(node) && utils.isMemberExpression(node.callee)) {
+                    if ((utils.isAngularComponent(node) || utils.isAngularComponentDeclaration(node)) && utils.isMemberExpression(node.callee)) {
                         var name = node.arguments[0].value;
                         var type = componentTypeMappings[node.callee.property.name];
                         var expectedName;

rules/timeout-service.js

@@ -20,7 +20,7 @@ module.exports = {
         return {
 
             MemberExpression: function(node) {
-                if (node.property.name !== 'setTimeout') {
+                if (node.property.name !== 'setTimeout' || !node.object) {
                     return;
                 }
 
@@ -35,6 +35,10 @@ module.exports = {
                 // Detect expression this.$window.setTimeout which is what we would see in ES6 code when using classes
                 var parentNode = node.object;
 
+                if (!parentNode.object) {
+                    return;
+                }
+
                 if (parentNode.object.type === 'ThisExpression' && parentNode.property.name === '$window') {
                     context.report(node, message, {});
                 }

rules/utils/false-values.js

@@ -1,6 +1,6 @@
 'use strict';
 
 module.exports = {
-    config: [/Provider$/, /$route/],
+    config: [/Provider$/, /$route/, 'require'],
     run: [/mocha/, /Service$/]
 };

test/file-name.js

@@ -102,9 +102,9 @@ angular.module(mod, [mod + '.core.angular', mod + '.thirdparty']);
             ignoreTypeSuffix: true
         }]
     }, {
-        // typeSeparator dot with controller and ignored type suffix
-        filename: 'src/app/Avengers.controller.js',
-        code: 'app.controller("AvengersController", function() {});',
+        // typeSeparator dot with component and ignored type suffix
+        filename: 'src/app/Avengers.component.js',
+        code: 'app.component("AvengersComponent", {});',
         options: [{
             typeSeparator: 'dot',
             ignoreTypeSuffix: true
@@ -287,6 +287,14 @@ angular.module(mod, [mod + '.core.angular', mod + '.thirdparty']);
             typeSeparator: 'dot'
         }],
         errors: [{message: 'Filename must be "AvengersController.controller.js"'}]
+    }, {
+        // typeSeparator dot with component, but no ignored type suffix
+        filename: 'src/app/Avengers.component.js',
+        code: 'app.component("AvengersComponent", {});',
+        options: [{
+            typeSeparator: 'dot'
+        }],
+        errors: [{message: 'Filename must be "AvengersComponent.component.js"'}]
     }, {
         // typeSeparator dot with controller and ignored type suffix
         filename: 'src/app/AvengersController.controller.js',
@@ -296,6 +304,15 @@ angular.module(mod, [mod + '.core.angular', mod + '.thirdparty']);
             ignoreTypeSuffix: true
         }],
         errors: [{message: 'Filename must be "Avengers.controller.js"'}]
+    }, {
+        // typeSeparator dot with component and ignored type suffix
+        filename: 'src/app/AvengersComponent.component.js',
+        code: 'app.component("AvengersComponent", {});',
+        options: [{
+            typeSeparator: 'dot',
+            ignoreTypeSuffix: true
+        }],
+        errors: [{message: 'Filename must be "Avengers.component.js"'}]
     }, {
         // nameStyle dash and typeSeparator dot with directive
         filename: 'src/app/avangerProfile.directive.js',

test/module-getter.js

@@ -15,6 +15,7 @@ var commonFalsePositives = require('./utils/commonFalsePositives');
 var eslintTester = new RuleTester();
 eslintTester.run('module-getter', rule, {
     valid: [
+        'require.config({});',
         'angular.module("module").config(function(jwtOptionsProvider){' +
             'jwtOptionsProvider.config({' +
                 'whiteListedDomains: []' +

test/timeout-service.js

@@ -18,6 +18,7 @@ var message = 'You should use the $timeout service instead of the default window
 
 eslintTester.run('timeout-service', rule, {
     valid: [
+        'jasmine.getGlobal().setTimeout',
         '$timeout(function() {})',
         '$timeout(function() {}, 1000)',
         '$timeout(function() {}, 1000, true)',