fixed typeof check and add possible positives (#232)

EmmanuelDemey · Dec 6, 2015 · 8e36405 · 8e36405
1 parent 7e70866
commit 8e36405
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/rules/definedundefined.js b/rules/definedundefined.js
@@ -38,9 +38,9 @@ module.exports = function(context) {
         },
         BinaryExpression: function(node) {
             if (isCompareOperator(node.operator)) {
-                if (utils.isTypeOfStatement(node.left) || utils.isToStringStatement(node.left)) {
+                if (utils.isTypeOfStatement(node.left) && node.right.value === 'undefined') {
                     reportError(node);
-                } else if (utils.isTypeOfStatement(node.right) || utils.isToStringStatement(node.right)) {
+                } else if (utils.isTypeOfStatement(node.right) && node.left.value === 'undefined') {
                     reportError(node);
                 } else if (node.left.type === 'Identifier' && node.left.name === 'undefined') {
                     reportError(node);

diff --git a/test/definedundefined.js b/test/definedundefined.js
@@ -16,15 +16,26 @@ var eslintTester = new RuleTester();
 eslintTester.run('definedundefined', rule, {
     valid: [
         'angular.isUndefined(toto)',
-        'angular.isDefined(toto)'
+        'angular.isDefined(toto)',
+        // possible false positives
+        'variable === otherValue',
+        'variable === null',
+        'variable > undefined',
+        'angular.isString(null)'
     ].concat(commonFalsePositives),
     invalid: [
         {code: 'variable === undefined', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
         {code: 'undefined === variable', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
         {code: 'undefined !== variable', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
         {code: 'variable !== undefined', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
-        {code: 'typeof variable == "undefined"', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
+        {code: 'variable == undefined', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
+        {code: 'undefined == variable', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
+        {code: 'undefined != variable', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
+        {code: 'variable != undefined', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
+        {code: 'typeof variable === "undefined"', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
         {code: 'typeof variable !== "undefined"', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
+        {code: '"undefined" == typeof variable', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
+        {code: '"undefined" != typeof variable', errors: [{message: 'You should not use directly the "undefined" keyword. Prefer angular.isUndefined or angular.isDefined'}]},
         {code: '!angular.isUndefined(variable)', errors: [{message: 'Instead of !angular.isUndefined, you can use the out-of-box angular.isDefined method'}]},
         {code: '!angular.isDefined(variable)', errors: [{message: 'Instead of !angular.isDefined, you can use the out-of-box angular.isUndefined method'}]}
     ]