fix: improve handling of .each calls and with tagged literals (#814)

* fix: improve handling of `.each` calls and with tagged literals

* refactor(no-focused-tests): greatly deduplicate code

* refactor: remove unneeded utils

* refactor(no-standalone-expect): remove unneeded check

* test(no-conditional-expect): add cases for `each()()`

* test(no-test-return-statement): add cases for `each()()`

* fix(no-if): support `each()()`

src/rules/__tests__/lowercase-name.test.ts

@@ -191,7 +191,7 @@ ruleTester.run('lowercase-name', rule, {
         {
           messageId: 'unexpectedLowercase',
           data: { method: TestCaseName.it },
-          column: 9,
+          column: 29,
           line: 1,
         },
       ],
@@ -203,7 +203,7 @@ ruleTester.run('lowercase-name', rule, {
         {
           messageId: 'unexpectedLowercase',
           data: { method: DescribeAlias.describe },
-          column: 15,
+          column: 35,
           line: 1,
         },
       ],

src/rules/__tests__/no-conditional-expect.test.ts

@@ -151,6 +151,14 @@ ruleTester.run('logical conditions', rule, {
       `,
       errors: [{ messageId: 'conditionalExpect' }],
     },
+    {
+      code: `
+        it.each()('foo', () => {
+          something || expect(something).toHaveBeenCalled();
+        })
+      `,
+      errors: [{ messageId: 'conditionalExpect' }],
+    },
     {
       code: `
         function getValue() {
@@ -218,6 +226,14 @@ ruleTester.run('conditional conditions', rule, {
       `,
       errors: [{ messageId: 'conditionalExpect' }],
     },
+    {
+      code: `
+        it.each()('foo', () => {
+          something ? noop() : expect(something).toHaveBeenCalled();
+        })
+      `,
+      errors: [{ messageId: 'conditionalExpect' }],
+    },
     {
       code: `
         function getValue() {
@@ -304,6 +320,19 @@ ruleTester.run('switch conditions', rule, {
       `,
       errors: [{ messageId: 'conditionalExpect' }],
     },
+    {
+      code: `
+        it.each()('foo', () => {
+          switch(something) {
+            case 'value':
+              expect(something).toHaveBeenCalled();
+            default:
+              break;
+          }
+        })
+      `,
+      errors: [{ messageId: 'conditionalExpect' }],
+    },
     {
       code: `
         function getValue() {
@@ -384,6 +413,18 @@ ruleTester.run('if conditions', rule, {
       `,
       errors: [{ messageId: 'conditionalExpect' }],
     },
+    {
+      code: `
+        it.each()('foo', () => {
+          if(!doSomething) {
+            // do nothing
+          } else {
+            expect(something).toHaveBeenCalled();
+          }
+        })
+      `,
+      errors: [{ messageId: 'conditionalExpect' }],
+    },
     {
       code: `
         function getValue() {
@@ -491,6 +532,18 @@ ruleTester.run('catch conditions', rule, {
       `,
       errors: [{ messageId: 'conditionalExpect' }],
     },
+    {
+      code: `
+        it.each()('foo', () => {
+          try {
+  
+          } catch (err) {
+            expect(err).toMatch('Error');
+          }
+        })
+      `,
+      errors: [{ messageId: 'conditionalExpect' }],
+    },
     {
       code: `
         it.skip.each\`\`('foo', () => {
@@ -503,6 +556,18 @@ ruleTester.run('catch conditions', rule, {
       `,
       errors: [{ messageId: 'conditionalExpect' }],
     },
+    {
+      code: `
+        it.skip.each()('foo', () => {
+          try {
+  
+          } catch (err) {
+            expect(err).toMatch('Error');
+          }
+        })
+      `,
+      errors: [{ messageId: 'conditionalExpect' }],
+    },
     {
       code: `
         function getValue() {

src/rules/__tests__/no-focused-tests.test.ts

@@ -46,7 +46,7 @@ ruleTester.run('no-focused-tests', rule, {
       ],
     },
     {
-      code: 'describe.only.each()',
+      code: 'describe.only.each()()',
       errors: [
         {
           messageId: 'focusedTest',
@@ -55,7 +55,7 @@ ruleTester.run('no-focused-tests', rule, {
           suggestions: [
             {
               messageId: 'suggestRemoveFocus',
-              output: 'describe.each()',
+              output: 'describe.each()()',
             },
           ],
         },
@@ -126,7 +126,7 @@ ruleTester.run('no-focused-tests', rule, {
       ],
     },
     {
-      code: 'it.only.each()',
+      code: 'it.only.each()()',
       errors: [
         {
           messageId: 'focusedTest',
@@ -135,7 +135,7 @@ ruleTester.run('no-focused-tests', rule, {
           suggestions: [
             {
               messageId: 'suggestRemoveFocus',
-              output: 'it.each()',
+              output: 'it.each()()',
             },
           ],
         },
@@ -206,7 +206,7 @@ ruleTester.run('no-focused-tests', rule, {
       ],
     },
     {
-      code: 'test.only.each()',
+      code: 'test.only.each()()',
       errors: [
         {
           messageId: 'focusedTest',
@@ -215,7 +215,7 @@ ruleTester.run('no-focused-tests', rule, {
           suggestions: [
             {
               messageId: 'suggestRemoveFocus',
-              output: 'test.each()',
+              output: 'test.each()()',
             },
           ],
         },
@@ -286,7 +286,7 @@ ruleTester.run('no-focused-tests', rule, {
       ],
     },
     {
-      code: 'fit.each()',
+      code: 'fit.each()()',
       errors: [
         {
           messageId: 'focusedTest',
@@ -295,7 +295,7 @@ ruleTester.run('no-focused-tests', rule, {
           suggestions: [
             {
               messageId: 'suggestRemoveFocus',
-              output: 'it.each()',
+              output: 'it.each()()',
             },
           ],
         },

src/rules/__tests__/no-if.test.ts

@@ -27,6 +27,13 @@ ruleTester.run('conditional expressions', rule, {
         };
       });
     `,
+    dedent`
+      it.each()('foo', function () {
+        const foo = function (bar) {
+          return foo ? bar : null;
+        };
+      });
+    `,
   ],
   invalid: [
     {
@@ -120,6 +127,11 @@ ruleTester.run('switch statements', rule, {
         switch('bar') {}
       })
     `,
+    dedent`
+      describe.skip.each()('foo', () => {
+        switch('bar') {}
+      })
+    `,
     dedent`
       xdescribe('foo', () => {
         switch('bar') {}
@@ -501,6 +513,13 @@ ruleTester.run('if statements', rule, {
         });
       })
     `,
+    dedent`
+      describe.each\`\`('foo', () => {
+        afterEach(() => {
+          if('bar') {}
+        });
+      })
+    `,
     dedent`
       describe('foo', () => {
         beforeEach(() => {
@@ -826,6 +845,20 @@ ruleTester.run('if statements', rule, {
         },
       ],
     },
+    {
+      code: dedent`
+        it.each()('foo', () => {
+          callExpression()
+          if ('bar') {}
+        })
+      `,
+      errors: [
+        {
+          data: { condition: 'if' },
+          messageId: 'conditionalInTest',
+        },
+      ],
+    },
     {
       code: dedent`
         it.only.each\`\`('foo', () => {
@@ -840,6 +873,20 @@ ruleTester.run('if statements', rule, {
         },
       ],
     },
+    {
+      code: dedent`
+        it.only.each()('foo', () => {
+          callExpression()
+          if ('bar') {}
+        })
+      `,
+      errors: [
+        {
+          data: { condition: 'if' },
+          messageId: 'conditionalInTest',
+        },
+      ],
+    },
     {
       code: dedent`
         describe('valid', () => {

src/rules/__tests__/no-test-return-statement.test.ts

@@ -68,6 +68,14 @@ ruleTester.run('no-test-return-statement', rule, {
       `,
       errors: [{ messageId: 'noReturnValue', column: 3, line: 2 }],
     },
+    {
+      code: dedent`
+        it.each()("one", function () {
+          return expect(1).toBe(1);
+        });
+      `,
+      errors: [{ messageId: 'noReturnValue', column: 3, line: 2 }],
+    },
     {
       code: dedent`
         it.only.each\`\`("one", function () {
@@ -76,6 +84,14 @@ ruleTester.run('no-test-return-statement', rule, {
       `,
       errors: [{ messageId: 'noReturnValue', column: 3, line: 2 }],
     },
+    {
+      code: dedent`
+        it.only.each()("one", function () {
+          return expect(1).toBe(1);
+        });
+      `,
+      errors: [{ messageId: 'noReturnValue', column: 3, line: 2 }],
+    },
     {
       code: dedent`
         it("one", myTest);

src/rules/__tests__/utils.test.ts

@@ -20,6 +20,7 @@ const rule = createRule({
     messages: {
       details: [
         'callType', //
+        'numOfArgs',
       ]
         .map(data => `${data}: {{ ${data} }}`)
         .join('\n'),
@@ -38,7 +39,10 @@ const rule = createRule({
         context.report({
           messageId: 'details',
           node,
-          data: { callType },
+          data: {
+            callType,
+            numOfArgs: node.arguments.length,
+          },
         });
       }
     },
@@ -86,7 +90,10 @@ const testUtilsAgainst = (
       errors: [
         {
           messageId: 'details' as const,
-          data: { callType },
+          data: {
+            callType,
+            numOfArgs: 2,
+          },
           column: 1,
           line: 1,
         },

src/rules/consistent-test-it.ts

@@ -8,7 +8,6 @@ import {
   createRule,
   getNodeName,
   isDescribeCall,
-  isEachCall,
   isTestCaseCall,
 } from './utils';
 
@@ -86,6 +85,8 @@ export default createRule<
         const funcNode =
           node.callee.type === AST_NODE_TYPES.TaggedTemplateExpression
             ? node.callee.tag
+            : node.callee.type === AST_NODE_TYPES.CallExpression
+            ? node.callee.callee
             : node.callee;
 
         if (
@@ -121,7 +122,7 @@ export default createRule<
         }
       },
       'CallExpression:exit'(node) {
-        if (isDescribeCall(node) && !isEachCall(node)) {
+        if (isDescribeCall(node)) {
           describeNestingLevel--;
         }
       },