#15759 Fix it.concurrent not working with describe.skip (#15765)

Co-authored-by: Christoph Nakazawa <[email protected]>
Co-authored-by: Christoph Nakazawa <[email protected]>

Author: eyalroth

CHANGELOG.md

@@ -1,13 +1,13 @@
 ## main
 
-
 ### Features
 
 - `[jest-runtime]` Reduce redundant ReferenceError messages
 - `[jest-core]` Include test modules that failed to load when --onlyFailures is active
 
 ### Fixes
 
+- `[jest-circus]` Fix `it.concurrent` not working with `describe.skip` ([#15765](https://github.com/jestjs/jest/pull/15765))
 - `[jest-snapshot]` Fix mangled inline snapshot updates when used with Prettier 3 and CRLF line endings
 - `[jest-runtime]` Importing from `@jest/globals` in more than one file no longer breaks relative paths ([#15772](https://github.com/jestjs/jest/issues/15772))
 

packages/jest-circus/src/__tests__/__snapshots__/baseTest.test.ts.snap

@@ -72,6 +72,54 @@ run_finish
 unhandledErrors: 0"
 `;
 
+exports[`describe.skip + concurrent 1`] = `
+"start_describe_definition: describe
+add_hook: beforeEach
+add_hook: afterEach
+add_test: one
+add_test: two
+add_test: three
+finish_describe_definition: describe
+run_start
+run_describe_start: ROOT_DESCRIBE_BLOCK
+run_describe_start: describe
+test_start: one
+test_start: two
+test_start: three
+test_skip
+test_skip
+test_skip
+run_describe_finish: describe
+run_describe_finish: ROOT_DESCRIBE_BLOCK
+run_finish
+
+unhandledErrors: 0"
+`;
+
+exports[`describe.skip + concurrent.each 1`] = `
+"start_describe_definition: describe
+add_hook: beforeEach
+add_hook: afterEach
+add_test: one
+add_test: two
+add_test: three
+finish_describe_definition: describe
+run_start
+run_describe_start: ROOT_DESCRIBE_BLOCK
+run_describe_start: describe
+test_start: one
+test_start: two
+test_start: three
+test_skip
+test_skip
+test_skip
+run_describe_finish: describe
+run_describe_finish: ROOT_DESCRIBE_BLOCK
+run_finish
+
+unhandledErrors: 0"
+`;
+
 exports[`failures 1`] = `
 "start_describe_definition: describe
 add_hook: beforeEach
@@ -126,6 +174,32 @@ run_finish
 unhandledErrors: 0"
 `;
 
+exports[`nested describe.skip + concurrent 1`] = `
+"start_describe_definition: describe
+start_describe_definition: nested
+add_test: one
+add_test: two
+add_test: three
+finish_describe_definition: nested
+finish_describe_definition: describe
+run_start
+run_describe_start: ROOT_DESCRIBE_BLOCK
+run_describe_start: describe
+test_start: one
+test_start: two
+test_start: three
+run_describe_start: nested
+test_skip
+test_skip
+test_skip
+run_describe_finish: nested
+run_describe_finish: describe
+run_describe_finish: ROOT_DESCRIBE_BLOCK
+run_finish
+
+unhandledErrors: 0"
+`;
+
 exports[`simple test 1`] = `
 "start_describe_definition: describe
 add_hook: beforeEach

packages/jest-circus/src/__tests__/baseTest.test.ts

@@ -83,3 +83,72 @@ test('concurrent.each', () => {
 
   expect(stdout).toMatchSnapshot();
 });
+
+test('describe.skip + concurrent', () => {
+  const {stdout} = runTest(`
+    describe.skip('describe', () => {
+      beforeEach(() => {});
+      afterEach(() => { throw new Error('banana')});
+      test.concurrent('one', () => {
+        console.log('hello one');
+        throw new Error('kentucky')
+      });
+      test.concurrent('two', () => {
+        console.log('hello two');
+      });
+      test.concurrent('three', async () => {
+        console.log('hello three');
+        await Promise.resolve();
+      });
+    })
+  `);
+
+  expect(stdout).not.toEqual(expect.stringContaining('hello'));
+
+  expect(stdout).toMatchSnapshot();
+});
+
+test('describe.skip + concurrent.each', () => {
+  const {stdout} = runTest(`
+    describe.skip('describe', () => {
+      beforeEach(() => {});
+      afterEach(() => { throw new Error('banana')});
+      test.concurrent.each([
+        ['one'],
+        ['two'],
+        ['three'],
+      ])('%s', async (name) => {
+        console.log('hello %s', name);
+        await Promise.resolve();
+      });
+    })
+  `);
+
+  expect(stdout).not.toEqual(expect.stringContaining('hello'));
+
+  expect(stdout).toMatchSnapshot();
+});
+
+test('nested describe.skip + concurrent', () => {
+  const {stdout} = runTest(`
+    describe('describe', () => {
+      describe.skip('nested', () => {
+        test.concurrent('one', () => {
+          console.log('hello one');
+          throw new Error('kentucky')
+        });
+        test.concurrent('two', () => {
+          console.log('hello two');
+        });
+        test.concurrent('three', async () => {
+          console.log('hello three');
+          await Promise.resolve();
+        });
+      })
+    })
+  `);
+
+  expect(stdout).not.toEqual(expect.stringContaining('hello'));
+
+  expect(stdout).toMatchSnapshot();
+});

packages/jest-circus/src/run.ts

@@ -169,9 +169,6 @@ const _runTestsForDescribeBlock = async (
 function collectConcurrentTests(
   describeBlock: Circus.DescribeBlock,
 ): Array<ConcurrentTestEntry> {
-  if (describeBlock.mode === 'skip') {
-    return [];
-  }
   return describeBlock.children.flatMap(child => {
     switch (child.type) {
       case 'describeBlock':