chris feedback

docs/rules/jest/no-if.md

@@ -1,9 +1,9 @@
 # Prevent if statements in tests. (jest/no-if)
-This rule prevents the use of if statements in tests. 
+This rule prevents the use of if statements in tests.
 
 ## Rule Details
 
-If statments in tests is usually an indication that a test is attempting to cover too much. Each branch of code executing within an if statement will likely be better served by a test devoted to it.
+If statments in tests is usually an indication that a test is attempting to cover too much, and are at risk of not testing the logic they intend to. Each branch of code executing within an if statement will likely be better served by a test devoted to it.
 
 Examples of **incorrect** code for this rule:
 

lib/rules/jest/no-if.js

@@ -24,24 +24,25 @@ module.exports = {
         'Tests should not contain if statements.',
         'This is usually an indication that you',
         'are attempting to test too much at once',
-        'and may want to consider breaking the if',
-        'statement out into a separate test.',
+        'or not testing what you intend to.',
+        'Consider breaking the if statement out',
+        'into a separate test to resolve this error.',
       ].join(' '),
     },
   },
 
   create(context) {
-    let inCallExpression = false;
+    let callExpressionDepth = 0;
 
     return {
       CallExpression(node) {
-        if (notTestFunction(node) || hasEmptyBody(node)) {
+        if (ignore(node)) {
           return;
         }
-        inCallExpression = true;
+        callExpressionDepth++;
       },
       IfStatement(node) {
-        if (!inCallExpression) {
+        if (callExpressionDepth === 0) {
           return;
         }
 
@@ -50,13 +51,20 @@ module.exports = {
           node,
         });
       },
-      'CallExpression:exit': () => {
-        inCallExpression = false;
+      'CallExpression:exit': (node) => {
+        if (ignore(node)) {
+          return;
+        }
+        callExpressionDepth--;
       },
     };
   },
 };
 
+function ignore(node) {
+  return notTestFunction(node) || hasEmptyBody(node);
+}
+
 function notTestFunction(node) {
   const method = getMethodName(node);
   return !matchTestFunctionName(method);

tests/lib/rules/jest/no-if.js

@@ -225,5 +225,18 @@ ruleTester.run('no-if', rule, {
         },
       ],
     },
+    {
+      code: `it('foo', () => {
+        callExpression()
+        if ('bar') {}
+      })
+      `,
+      parser,
+      errors: [
+        {
+          messageId: 'noIf',
+        },
+      ],
+    },
   ],
 });