feat(rules): add .concurrent support (#498) (#502)

* feat(rules): add .concurrent support * refactor(no-focused): remove unnecessary type cast * chore(utils): inline `isConcurrentTestCase` * chore(no-focused-tests): use static checks instead of dynamic RegExp * chore(no-focused-tests): add test case for if `concurrent` is called * chore(utils): remove body from arrow functions Co-authored-by: Leonardo Villela <[email protected]>
jest-community · Jan 4, 2020 · dcba5f1 · dcba5f1
1 parent 02e7cef
commit dcba5f1
Show file tree

Hide file tree

Showing 15 changed files with 354 additions and 33 deletions.
diff --git a/src/rules/__tests__/consistent-test-it.test.ts b/src/rules/__tests__/consistent-test-it.test.ts
@@ -24,6 +24,10 @@ ruleTester.run('consistent-test-it with fn=test', rule, {
       code: 'test.skip("foo")',
       options: [{ fn: TestCaseName.test }],
     },
+    {
+      code: 'test.concurrent("foo")',
+      options: [{ fn: TestCaseName.test }],
+    },
     {
       code: 'xtest("foo")',
       options: [{ fn: TestCaseName.test }],
@@ -90,6 +94,20 @@ ruleTester.run('consistent-test-it with fn=test', rule, {
       ],
       output: 'test.skip("foo")',
     },
+    {
+      code: 'it.concurrent("foo")',
+      options: [{ fn: TestCaseName.test }],
+      errors: [
+        {
+          messageId: 'consistentMethod',
+          data: {
+            testKeyword: TestCaseName.test,
+            oppositeTestKeyword: TestCaseName.it,
+          },
+        },
+      ],
+      output: 'test.concurrent("foo")',
+    },
     {
       code: 'it.only("foo")',
       options: [{ fn: TestCaseName.test }],
@@ -143,6 +161,10 @@ ruleTester.run('consistent-test-it with fn=it', rule, {
       code: 'it.skip("foo")',
       options: [{ fn: TestCaseName.it }],
     },
+    {
+      code: 'it.concurrent("foo")',
+      options: [{ fn: TestCaseName.it }],
+    },
     {
       code: 'describe("suite", () => { it("foo") })',
       options: [{ fn: TestCaseName.it }],
@@ -191,6 +213,20 @@ ruleTester.run('consistent-test-it with fn=it', rule, {
       ],
       output: 'it.skip("foo")',
     },
+    {
+      code: 'test.concurrent("foo")',
+      options: [{ fn: TestCaseName.it }],
+      errors: [
+        {
+          messageId: 'consistentMethod',
+          data: {
+            testKeyword: TestCaseName.it,
+            oppositeTestKeyword: TestCaseName.test,
+          },
+        },
+      ],
+      output: 'it.concurrent("foo")',
+    },
     {
       code: 'test.only("foo")',
       options: [{ fn: TestCaseName.it }],
@@ -236,6 +272,10 @@ ruleTester.run('consistent-test-it with fn=test and withinDescribe=it ', rule, {
       code: 'test.skip("foo")',
       options: [{ fn: TestCaseName.test, withinDescribe: TestCaseName.it }],
     },
+    {
+      code: 'test.concurrent("foo")',
+      options: [{ fn: TestCaseName.test, withinDescribe: TestCaseName.it }],
+    },
     {
       code: 'xtest("foo")',
       options: [{ fn: TestCaseName.test, withinDescribe: TestCaseName.it }],
@@ -302,6 +342,20 @@ ruleTester.run('consistent-test-it with fn=test and withinDescribe=it ', rule, {
       ],
       output: 'describe("suite", () => { it.skip("foo") })',
     },
+    {
+      code: 'describe("suite", () => { test.concurrent("foo") })',
+      options: [{ fn: TestCaseName.test, withinDescribe: TestCaseName.it }],
+      errors: [
+        {
+          messageId: 'consistentMethodWithinDescribe',
+          data: {
+            testKeywordWithinDescribe: TestCaseName.it,
+            oppositeTestKeyword: TestCaseName.test,
+          },
+        },
+      ],
+      output: 'describe("suite", () => { it.concurrent("foo") })',
+    },
   ],
 });
 
@@ -319,6 +373,10 @@ ruleTester.run('consistent-test-it with fn=it and withinDescribe=test ', rule, {
       code: 'it.skip("foo")',
       options: [{ fn: TestCaseName.it, withinDescribe: TestCaseName.test }],
     },
+    {
+      code: 'it.concurrent("foo")',
+      options: [{ fn: TestCaseName.it, withinDescribe: TestCaseName.test }],
+    },
     {
       code: 'xit("foo")',
       options: [{ fn: TestCaseName.it, withinDescribe: TestCaseName.test }],
@@ -385,6 +443,20 @@ ruleTester.run('consistent-test-it with fn=it and withinDescribe=test ', rule, {
       ],
       output: 'describe("suite", () => { test.skip("foo") })',
     },
+    {
+      code: 'describe("suite", () => { it.concurrent("foo") })',
+      options: [{ fn: TestCaseName.it, withinDescribe: TestCaseName.test }],
+      errors: [
+        {
+          messageId: 'consistentMethodWithinDescribe',
+          data: {
+            testKeywordWithinDescribe: TestCaseName.test,
+            oppositeTestKeyword: TestCaseName.it,
+          },
+        },
+      ],
+      output: 'describe("suite", () => { test.concurrent("foo") })',
+    },
   ],
 });
 

diff --git a/src/rules/__tests__/no-commented-out-tests.test.ts b/src/rules/__tests__/no-commented-out-tests.test.ts
@@ -17,8 +17,10 @@ ruleTester.run('no-commented-out-tests', rule, {
     'it("foo", function () {})',
     'describe.only("foo", function () {})',
     'it.only("foo", function () {})',
+    'it.concurrent("foo", function () {})',
     'test("foo", function () {})',
     'test.only("foo", function () {})',
+    'test.concurrent("foo", function () {})',
     'var appliedSkip = describe.skip; appliedSkip.apply(describe)',
     'var calledSkip = it.skip; calledSkip.call(it)',
     '({ f: function () {} }).f()',
@@ -80,6 +82,10 @@ ruleTester.run('no-commented-out-tests', rule, {
       code: '// it.only("foo", function () {})',
       errors: [{ messageId: 'commentedTests', column: 1, line: 1 }],
     },
+    {
+      code: '// it.concurrent("foo", function () {})',
+      errors: [{ messageId: 'commentedTests', column: 1, line: 1 }],
+    },
     {
       code: '// it["skip"]("foo", function () {})',
       errors: [{ messageId: 'commentedTests', column: 1, line: 1 }],
@@ -88,6 +94,10 @@ ruleTester.run('no-commented-out-tests', rule, {
       code: '// test.skip("foo", function () {})',
       errors: [{ messageId: 'commentedTests', column: 1, line: 1 }],
     },
+    {
+      code: '// test.concurrent("foo", function () {})',
+      errors: [{ messageId: 'commentedTests', column: 1, line: 1 }],
+    },
     {
       code: '// test["skip"]("foo", function () {})',
       errors: [{ messageId: 'commentedTests', column: 1, line: 1 }],

diff --git a/src/rules/__tests__/no-disabled-tests.test.ts b/src/rules/__tests__/no-disabled-tests.test.ts
@@ -16,8 +16,10 @@ ruleTester.run('no-disabled-tests', rule, {
     'it("foo", function () {})',
     'describe.only("foo", function () {})',
     'it.only("foo", function () {})',
+    'it.concurrent("foo", function () {})',
     'test("foo", function () {})',
     'test.only("foo", function () {})',
+    'test.concurrent("foo", function () {})',
     'describe[`${"skip"}`]("foo", function () {})',
     'var appliedSkip = describe.skip; appliedSkip.apply(describe)',
     'var calledSkip = it.skip; calledSkip.call(it)',
@@ -73,6 +75,10 @@ ruleTester.run('no-disabled-tests', rule, {
       code: 'it.skip("foo", function () {})',
       errors: [{ messageId: 'skippedTest', column: 1, line: 1 }],
     },
+    {
+      code: 'it.concurrent.skip("foo", function () {})',
+      errors: [{ messageId: 'skippedTest', column: 1, line: 1 }],
+    },
     {
       code: 'it["skip"]("foo", function () {})',
       errors: [{ messageId: 'skippedTest', column: 1, line: 1 }],
@@ -81,6 +87,10 @@ ruleTester.run('no-disabled-tests', rule, {
       code: 'test.skip("foo", function () {})',
       errors: [{ messageId: 'skippedTest', column: 1, line: 1 }],
     },
+    {
+      code: 'test.concurrent.skip("foo", function () {})',
+      errors: [{ messageId: 'skippedTest', column: 1, line: 1 }],
+    },
     {
       code: 'test["skip"]("foo", function () {})',
       errors: [{ messageId: 'skippedTest', column: 1, line: 1 }],

diff --git a/src/rules/__tests__/no-focused-tests.test.ts b/src/rules/__tests__/no-focused-tests.test.ts
@@ -15,14 +15,17 @@ ruleTester.run('no-focused-tests', rule, {
     'it()',
     'describe.skip()',
     'it.skip()',
+    'it.concurrent.skip()',
     'test()',
     'test.skip()',
+    'test.concurrent.skip()',
     'var appliedOnly = describe.only; appliedOnly.apply(describe)',
     'var calledOnly = it.only; calledOnly.call(it)',
     'it.each()()',
     'it.each`table`()',
     'test.each()()',
     'test.each`table`()',
+    'test.concurrent()',
   ],
 
   invalid: [
@@ -46,6 +49,10 @@ ruleTester.run('no-focused-tests', rule, {
       code: 'it.only()',
       errors: [{ messageId: 'focusedTest', column: 4, line: 1 }],
     },
+    {
+      code: 'it.concurrent.only()',
+      errors: [{ messageId: 'focusedTest', column: 4, line: 1 }],
+    },
     {
       code: 'it.only.each()',
       errors: [{ messageId: 'focusedTest', column: 4, line: 1 }],
@@ -62,6 +69,10 @@ ruleTester.run('no-focused-tests', rule, {
       code: 'test.only()',
       errors: [{ messageId: 'focusedTest', column: 6, line: 1 }],
     },
+    {
+      code: 'test.concurrent.only()',
+      errors: [{ messageId: 'focusedTest', column: 6, line: 1 }],
+    },
     {
       code: 'test.only.each()',
       errors: [{ messageId: 'focusedTest', column: 6, line: 1 }],

diff --git a/src/rules/__tests__/no-identical-title.test.ts b/src/rules/__tests__/no-identical-title.test.ts
@@ -25,10 +25,22 @@ ruleTester.run('no-identical-title', rule, {
       '});',
     ].join('\n'),
     ['it("it1", function() {});', 'it("it2", function() {});'].join('\n'),
+    [
+      'it.concurrent("it1", function() {});',
+      'it.concurrent("it2", function() {});',
+    ].join('\n'),
     ['it.only("it1", function() {});', 'it("it2", function() {});'].join('\n'),
     ['it.only("it1", function() {});', 'it.only("it2", function() {});'].join(
       '\n',
     ),
+    [
+      'it.concurrent.only("it1", function() {});',
+      'it.concurrent("it2", function() {});',
+    ].join('\n'),
+    [
+      'it.concurrent.only("it1", function() {});',
+      'it.concurrent.only("it2", function() {});',
+    ].join('\n'),
     ['describe("title", function() {});', 'it("title", function() {});'].join(
       '\n',
     ),
@@ -118,13 +130,27 @@ ruleTester.run('no-identical-title', rule, {
       ),
       errors: [{ messageId: 'multipleTestTitle', column: 4, line: 2 }],
     },
+    {
+      code: [
+        'it.concurrent("it1", function() {});',
+        'it.concurrent("it1", function() {});',
+      ].join('\n'),
+      errors: [{ messageId: 'multipleTestTitle', column: 15, line: 2 }],
+    },
     {
       code: [
         'it.only("it1", function() {});',
         'it("it1", function() {});',
       ].join('\n'),
       errors: [{ messageId: 'multipleTestTitle', column: 4, line: 2 }],
     },
+    {
+      code: [
+        'it.concurrent.only("it1", function() {});',
+        'it.concurrent("it1", function() {});',
+      ].join('\n'),
+      errors: [{ messageId: 'multipleTestTitle', column: 15, line: 2 }],
+    },
     {
       code: ['fit("it1", function() {});', 'it("it1", function() {});'].join(
         '\n',
@@ -138,6 +164,13 @@ ruleTester.run('no-identical-title', rule, {
       ].join('\n'),
       errors: [{ messageId: 'multipleTestTitle', column: 9, line: 2 }],
     },
+    {
+      code: [
+        'it.concurrent.only("it1", function() {});',
+        'it.concurrent.only("it1", function() {});',
+      ].join('\n'),
+      errors: [{ messageId: 'multipleTestTitle', column: 20, line: 2 }],
+    },
     {
       code: [
         'describe("describe1", function() {});',

diff --git a/src/rules/__tests__/no-if.test.ts b/src/rules/__tests__/no-if.test.ts
@@ -190,6 +190,16 @@ ruleTester.run('no-if', rule, {
         },
       ],
     },
+    {
+      code: `it.concurrent.skip('foo', () => {
+        if('bar') {}
+      })`,
+      errors: [
+        {
+          messageId: 'noIf',
+        },
+      ],
+    },
     {
       code: `it.only('foo', () => {
         if('bar') {}
@@ -200,6 +210,16 @@ ruleTester.run('no-if', rule, {
         },
       ],
     },
+    {
+      code: `it.concurrent.only('foo', () => {
+        if('bar') {}
+      })`,
+      errors: [
+        {
+          messageId: 'noIf',
+        },
+      ],
+    },
     {
       code: `xit('foo', () => {
         if('bar') {}
@@ -220,6 +240,16 @@ ruleTester.run('no-if', rule, {
         },
       ],
     },
+    {
+      code: `fit.concurrent('foo', () => {
+        if('bar') {}
+      })`,
+      errors: [
+        {
+          messageId: 'noIf',
+        },
+      ],
+    },
     {
       code: `test('foo', () => {
         if('bar') {}
@@ -231,7 +261,7 @@ ruleTester.run('no-if', rule, {
       ],
     },
     {
-      code: `test.skip('foo', () => {
+      code: `test.concurrent.skip('foo', () => {
         if('bar') {}
       })`,
       errors: [
@@ -241,7 +271,7 @@ ruleTester.run('no-if', rule, {
       ],
     },
     {
-      code: `test.only('foo', () => {
+      code: `test.concurrent.only('foo', () => {
         if('bar') {}
       })`,
       errors: [

diff --git a/src/rules/__tests__/no-standalone-expect.test.ts b/src/rules/__tests__/no-standalone-expect.test.ts
@@ -32,6 +32,7 @@ ruleTester.run('no-standalone-expect', rule, {
     });
     `,
     'it.only("an only", value => { expect(value).toBe(true); });',
+    'it.concurrent("an concurrent", value => { expect(value).toBe(true); });',
     'describe.each([1, true])("trues", value => { it("an it", () => expect(value).toBe(true) ); });',
   ],
   invalid: [