eslint-plugin-jest 26.4.0 → 26.4.1

package/lib/rules/no-disabled-tests.js

@@ -17,8 +17,6 @@ var _default = (0, _utils.createRule)({
     },
     messages: {
       missingFunction: 'Test is missing function argument',
-      skippedTestSuite: 'Skipped test suite',
-      skippedTest: 'Skipped test',
       pending: 'Call to pending()',
       pendingSuite: 'Call to pending() within test suite',
       pendingTest: 'Call to pending() within test',
@@ -34,14 +32,6 @@ var _default = (0, _utils.createRule)({
     let suiteDepth = 0;
     let testDepth = 0;
     return {
-      'CallExpression[callee.name="describe"]'() {
-        suiteDepth++;
-      },
-
-      'CallExpression[callee.name=/^(it|test)$/]'() {
-        testDepth++;
-      },
-
       'CallExpression[callee.name=/^(it|test)$/][arguments.length<2]'(node) {
         context.report({
           messageId: 'missingFunction',
@@ -50,35 +40,42 @@ var _default = (0, _utils.createRule)({
       },
 
       CallExpression(node) {
-        const functionName = (0, _utils.getNodeName)(node.callee); // prevent duplicate warnings for it.each()()
+        const jestFnCall = (0, _utils.parseJestFnCall)(node, context.getScope());
+
+        if (!jestFnCall) {
+          return;
+        }
+
+        if (jestFnCall.type === 'describe') {
+          suiteDepth++;
+        }
+
+        if (jestFnCall.type === 'test') {
+          testDepth++;
+        }
+
+        if ( // the only jest functions that are with "x" are "xdescribe", "xtest", and "xit"
+        jestFnCall.name.startsWith('x') || jestFnCall.members.some(s => (0, _utils.getAccessorValue)(s) === 'skip')) {
+          context.report({
+            messageId: jestFnCall.type === 'describe' ? 'disabledSuite' : 'disabledTest',
+            node
+          });
+        }
+      },
 
-        if (node.callee.type === 'CallExpression') {
+      'CallExpression:exit'(node) {
+        const jestFnCall = (0, _utils.parseJestFnCall)(node, context.getScope());
+
+        if (!jestFnCall) {
           return;
         }
 
-        switch (functionName) {
-          case 'describe.skip.each':
-          case 'xdescribe.each':
-          case 'describe.skip':
-            context.report({
-              messageId: 'skippedTestSuite',
-              node
-            });
-            break;
-
-          case 'it.skip':
-          case 'it.concurrent.skip':
-          case 'test.skip':
-          case 'test.concurrent.skip':
-          case 'it.skip.each':
-          case 'test.skip.each':
-          case 'xit.each':
-          case 'xtest.each':
-            context.report({
-              messageId: 'skippedTest',
-              node
-            });
-            break;
+        if (jestFnCall.type === 'describe') {
+          suiteDepth--;
+        }
+
+        if (jestFnCall.type === 'test') {
+          testDepth--;
         }
       },
 
@@ -103,28 +100,6 @@ var _default = (0, _utils.createRule)({
             node
           });
         }
-      },
-
-      'CallExpression[callee.name="xdescribe"]'(node) {
-        context.report({
-          messageId: 'disabledSuite',
-          node
-        });
-      },
-
-      'CallExpression[callee.name=/^(xit|xtest)$/]'(node) {
-        context.report({
-          messageId: 'disabledTest',
-          node
-        });
-      },
-
-      'CallExpression[callee.name="describe"]:exit'() {
-        suiteDepth--;
-      },
-
-      'CallExpression[callee.name=/^(it|test)$/]:exit'() {
-        testDepth--;
       }
 
     };

package/lib/rules/utils/parseJestFnCall.js

@@ -64,7 +64,7 @@ const determineJestFnType = name => {
   return 'unknown';
 };
 
-const ValidJestFnCallChains = ['afterAll', 'afterEach', 'beforeAll', 'beforeEach', 'describe', 'describe.each', 'describe.only', 'describe.only.each', 'describe.skip', 'describe.skip.each', 'fdescribe', 'fdescribe.each', 'xdescribe', 'xdescribe.each', 'it', 'it.concurrent', 'it.concurrent.each', 'it.concurrent.only.each', 'it.concurrent.skip.each', 'it.each', 'it.failing', 'it.only', 'it.only.each', 'it.skip', 'it.skip.each', 'it.todo', 'fit', 'fit.each', 'xit', 'xit.each', 'test', 'test.concurrent', 'test.concurrent.each', 'test.concurrent.only.each', 'test.concurrent.skip.each', 'test.each', 'test.only', 'test.only.each', 'test.skip', 'test.skip.each', 'test.todo', 'xtest', 'xtest.each', // todo: check if actually valid (not in docs)
+const ValidJestFnCallChains = ['afterAll', 'afterEach', 'beforeAll', 'beforeEach', 'describe', 'describe.each', 'describe.only', 'describe.only.each', 'describe.skip', 'describe.skip.each', 'fdescribe', 'fdescribe.each', 'xdescribe', 'xdescribe.each', 'it', 'it.concurrent', 'it.concurrent.each', 'it.concurrent.only.each', 'it.concurrent.skip.each', 'it.each', 'it.failing', 'it.only', 'it.only.each', 'it.only.failing', 'it.skip', 'it.skip.each', 'it.skip.failing', 'it.todo', 'fit', 'fit.each', 'fit.failing', 'xit', 'xit.each', 'xit.failing', 'test', 'test.concurrent', 'test.concurrent.each', 'test.concurrent.only.each', 'test.concurrent.skip.each', 'test.each', 'test.failing', 'test.only', 'test.only.each', 'test.only.failing', 'test.skip', 'test.skip.each', 'test.skip.failing', 'test.todo', 'xtest', 'xtest.each', 'xtest.failing', // todo: check if actually valid (not in docs)
 'test.concurrent.skip', 'test.concurrent.only', 'it.concurrent.skip', 'it.concurrent.only'];
 
 const parseJestFnCall = (node, scope) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "26.4.0",
+  "version": "26.4.1",
   "description": "ESLint rules for Jest",
   "keywords": [
     "eslint",