eslint-plugin-chai-friendly 1.2.0 → 1.2.1

package/lib/rules/no-unused-expressions.js

@@ -148,7 +148,8 @@ module.exports = {
             ClassExpression: alwaysTrue,
             ConditionalExpression(node) {
                 if (allowTernary) {
-                    return Checker.isDisallowed(node.consequent) || Checker.isDisallowed(node.alternate);
+                    return (Checker.isDisallowed(node.consequent) && !isChaiCall(node.consequent)) ||
+                           (Checker.isDisallowed(node.alternate) && !isChaiCall(node.alternate));
                 }
                 return true;
             },
@@ -163,7 +164,7 @@ module.exports = {
             },
             LogicalExpression(node) {
                 if (allowShortCircuit) {
-                    return Checker.isDisallowed(node.right);
+                    return Checker.isDisallowed(node.right) && !isChaiCall(node.right);
                 }
                 return true;
             },
@@ -198,16 +199,15 @@ module.exports = {
         /**
          * Determines whether or not a given node is a chai's expect statement.
          * e.g. expect(foo).to.eventually.be.true;
-         * @param {ASTNode} node - any node
+         * @param {ASTNode} expressionNode - expression node
          * @returns {boolean} whether the given node is a chai expectation
          */
-        function isChaiExpectCall(node) {
-            let expression = node.expression;
-            if (expression.type !== 'MemberExpression') {
+        function isChaiExpectCall(expressionNode) {
+            if (expressionNode.type !== 'MemberExpression') {
                 return false;
             }
 
-            return Boolean(findExpectCall(expression.object));
+            return Boolean(findExpectCall(expressionNode.object));
         }
 
         /**
@@ -239,19 +239,18 @@ module.exports = {
         /**
          * Determines whether or not a given node is a chai's should statement.
          * e.g. foo.should.eventually.be.true;
-         * @param {ASTNode} node - any node
+         * @param {ASTNode} expressionNode - expression node
          * @returns {boolean} whether the given node is a chai should statement
          */
-        function isChaiShouldCall(node) {
-            let expression = node.expression;
-            if (expression.type === 'ChainExpression') {
-                expression = expression.expression
+        function isChaiShouldCall(expressionNode) {
+            if (expressionNode.type === 'ChainExpression') {
+                expressionNode = expressionNode.expression
             }
-            if (expression.type !== 'MemberExpression') {
+            if (expressionNode.type !== 'MemberExpression') {
                 return false;
             }
 
-            return Boolean(findShouldCall(expression.object));
+            return Boolean(findShouldCall(expressionNode.object));
         }
 
         /**
@@ -280,13 +279,21 @@ module.exports = {
             return null;
         }
 
+        /**
+         * Determines whether or not a given node is a chai call.
+         * @param {ASTNode} expressionNode - expression node
+         * @returns {boolean} whether the given node is a chai call
+         */
+        function isChaiCall(expressionNode) {
+            return isChaiExpectCall(expressionNode) || isChaiShouldCall(expressionNode);
+        }
+
         return {
             ExpressionStatement: function(node) {
                 if (Checker.isDisallowed(node.expression)
                     && !isParserDirective(node)
                     && !(ignoreDirectives && isDirective(node))
-                    && !isChaiExpectCall(node)
-                    && !isChaiShouldCall(node)
+                    && !isChaiCall(node.expression)
                 ) {
                     context.report({node, messageId: "unusedExpression"});
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-chai-friendly",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "This plugin makes 'no-unused-expressions' rule friendly towards chai expect statements.",
   "keywords": [
     "eslint",