Merge branch 'main' into prettier-3-self

CHANGELOG.md

@@ -8,6 +8,12 @@
 
 ### Performance
 
+## 29.6.1
+
+### Fixes
+
+- `[jest-circus]` Revert [#14110](https://github.com/jestjs/jest/pull/14110) as it was a breaking change ([#14304](https://github.com/jestjs/jest/pull/14304))
+
 ## 29.6.0
 
 ### Features
@@ -32,6 +38,7 @@
 - `[jest-runtime]` Guard `_isMockFunction` access with `in` ([#14188](https://github.com/facebook/jest/pull/14188))
 - `[jest-snapshot]` Fix a potential bug when not using prettier and improve performance ([#14036](https://github.com/facebook/jest/pull/14036))
 - `[@jest/transform]` Do not instrument `.json` modules ([#14048](https://github.com/facebook/jest/pull/14048))
+- `[jest-worker]` Restart a shut down worker before sending it a task ([#14015](https://github.com/facebook/jest/pull/14015))
 
 ### Chore & Maintenance
 

e2e/__tests__/__snapshots__/environmentAfterTeardown.test.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`prints useful error for environment methods after test is done 1`] = `
-"    ReferenceError: You are trying to access a property or method of the Jest environment outside of the scope of the test code.
+"ReferenceError: You are trying to access a property or method of the Jest environment after it has been torn down. From __tests__/afterTeardown.test.js.
 
        9 | test('access environment methods after done', () => {
       10 |   setTimeout(() => {

e2e/__tests__/__snapshots__/requireAfterTeardown.test.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`prints useful error for requires after test is done 1`] = `
-"    ReferenceError: You are trying to \`import\` a file outside of the scope of the test code.
+"ReferenceError: You are trying to \`import\` a file after the Jest environment has been torn down. From __tests__/lateRequire.test.js.
 
        9 | test('require after done', () => {
       10 |   setTimeout(() => {

e2e/__tests__/environmentAfterTeardown.test.ts

@@ -5,17 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {skipSuiteOnJasmine} from '@jest/test-utils';
 import runJest from '../runJest';
 
-skipSuiteOnJasmine();
-
 test('prints useful error for environment methods after test is done', () => {
   const {stderr} = runJest('environment-after-teardown');
-  const interestingLines = stderr.split('\n').slice(5, 14).join('\n');
+  const interestingLines = stderr.split('\n').slice(9, 18).join('\n');
 
   expect(interestingLines).toMatchSnapshot();
-  expect(stderr.split('\n')[5]).toMatch(
-    'ReferenceError: You are trying to access a property or method of the Jest environment outside of the scope of the test code.',
+  expect(stderr.split('\n')[9]).toBe(
+    'ReferenceError: You are trying to access a property or method of the Jest environment after it has been torn down. From __tests__/afterTeardown.test.js.',
   );
 });

e2e/__tests__/fakeTimersLegacy.test.ts

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {isJestJasmineRun} from '@jest/test-utils';
 import runJest from '../runJest';
 
 describe('enableGlobally', () => {
@@ -40,13 +39,10 @@ describe('requestAnimationFrame', () => {
 
 describe('setImmediate', () => {
   test('fakes setImmediate', () => {
-    // Jasmine runner does not handle unhandled promise rejections that are causing the test to fail in Jest circus
-    const expectedExitCode = isJestJasmineRun() ? 0 : 1;
-
     const result = runJest('fake-timers-legacy/set-immediate');
 
     expect(result.stderr).toMatch('setImmediate test');
-    expect(result.exitCode).toBe(expectedExitCode);
+    expect(result.exitCode).toBe(0);
   });
 });