fix(expect, jest-snapshot, jest-circus, jest-types): Pass test.failin…

…g tests when containing failing snapshot matchers

CHANGELOG.md

@@ -25,6 +25,7 @@
 
 ### Fixes
 
+- `[expect, jest-snapshot]` Pass `test.failing` tests when containing failing snapshot matchers  ([#14313](https://github.com/jestjs/jest/pull/14313))
 - `[jest-circus]` Prevent false test failures caused by promise rejections handled asynchronously ([#14110](https://github.com/jestjs/jest/pull/14110))
 - `[jest-config]` Handle frozen config object ([#14054](https://github.com/facebook/jest/pull/14054))
 - `[jest-config]` Allow `coverageDirectory` and `collectCoverageFrom` in project config ([#14180](https://github.com/jestjs/jest/pull/14180))

e2e/__tests__/__snapshots__/testFailingSnapshot.test.js.snap

@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`test.failing doesnt update or remove snapshots 1`] = `
+"// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[\`snapshots not updated nor removed 1\`] = \`"1"\`;
+
+exports[\`snapshots not updated nor removed 2\`] = \`"1"\`;
+
+exports[\`snapshots not updated nor removed 3\`] = \`"1"\`;
+"
+`;
+
+exports[`test.failing doesnt update or remove snapshots 2`] = `
+"/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+test.failing('inline snapshot not updated', () => {
+  // eslint-disable-next-line quotes
+  expect('0').toMatchInlineSnapshot(\`"1"\`);
+});
+"
+`;

e2e/__tests__/testFailingSnapshot.test.js

@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import * as path from 'path';
+import * as fs from 'graceful-fs';
+import runJest from '../runJest';
+
+describe('test.failing', () => {
+  // Skip running tests with Jasmine
+  if (process.env.JEST_JASMINE) {
+    test.skip('No Jasmine runner', () => {});
+    return;
+  }
+
+  describe('should pass when', () => {
+    test.failing('snapshot matchers fails', () => {
+      expect('0').toMatchSnapshot();
+    });
+
+    test.failing('snapshot doesnt exist', () => {
+      expect('0').toMatchSnapshot();
+    });
+
+    test.failing('inline snapshot matchers fails', () => {
+      expect('0').toMatchInlineSnapshot('0');
+    });
+
+    test.failing('at least one snapshot fails', () => {
+      expect('1').toMatchSnapshot();
+      expect('0').toMatchSnapshot();
+    });
+  });
+
+  describe('should fail when', () => {
+    test.each([
+      ['snapshot', 'snapshot'],
+      ['inline snapshot', 'inlineSnapshot'],
+    ])('%s matchers pass', (_, fileName) => {
+      const dir = path.resolve(__dirname, '../test-failing-snapshot-all-pass');
+      const result = runJest(dir, [`./__tests__/${fileName}.test.js`]);
+      expect(result.exitCode).toBe(1);
+    });
+  });
+
+  it('doesnt update or remove snapshots', () => {
+    const dir = path.resolve(__dirname, '../test-failing-snapshot');
+    const result = runJest(dir, ['-u']);
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).not.toMatch(/snapshots? (written|removed|obsolete)/);
+
+    const snapshot = fs
+      .readFileSync(
+        path.resolve(dir, './__tests__/__snapshots__/snapshot.test.js.snap'),
+      )
+      .toString();
+    expect(snapshot).toMatchSnapshot();
+
+    const inlineSnapshot = fs
+      .readFileSync(path.resolve(dir, './__tests__/inlineSnapshot.test.js'))
+      .toString();
+    expect(inlineSnapshot).toMatchSnapshot();
+  });
+});

e2e/test-failing-snapshot-all-pass/__tests__/__snapshots__/snapshot.test.js.snap

@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`snapshots not updated 1`] = `"1"`;
+
+exports[`snapshots not updated 2`] = `"1"`;

e2e/test-failing-snapshot-all-pass/__tests__/inlineSnapshot.test.js

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+test.failing('inline snapshot not updated', () => {
+  // eslint-disable-next-line quotes
+  expect('1').toMatchInlineSnapshot(`"1"`);
+});

e2e/test-failing-snapshot-all-pass/__tests__/snapshot.test.js

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+test.failing('snapshots not updated', () => {
+  expect('1').toMatchSnapshot();
+  expect('1').toMatchSnapshot();
+});

e2e/test-failing-snapshot-all-pass/package.json

@@ -0,0 +1,5 @@
+{
+  "jest": {
+    "testEnvironment": "node"
+  }
+}

e2e/test-failing-snapshot/__tests__/__snapshots__/snapshot.test.js.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`snapshots not updated nor removed 1`] = `"1"`;
+
+exports[`snapshots not updated nor removed 2`] = `"1"`;
+
+exports[`snapshots not updated nor removed 3`] = `"1"`;

e2e/test-failing-snapshot/__tests__/inlineSnapshot.test.js

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+test.failing('inline snapshot not updated', () => {
+  // eslint-disable-next-line quotes
+  expect('0').toMatchInlineSnapshot(`"1"`);
+});

e2e/test-failing-snapshot/__tests__/snapshot.test.js

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+test.failing('snapshots not updated nor removed', () => {
+  expect('1').toMatchSnapshot();
+  expect('0').toMatchSnapshot();
+  expect('0').toMatchSnapshot();
+});

e2e/test-failing-snapshot/package.json

@@ -0,0 +1,5 @@
+{
+  "jest": {
+    "testEnvironment": "node"
+  }
+}

packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapter.ts

@@ -108,10 +108,16 @@ const _addSnapshotData = (
   results: TestResult,
   snapshotState: SnapshotState,
 ) => {
-  results.testResults.forEach(({fullName, status}) => {
-    if (status === 'pending' || status === 'failed') {
-      // if test is skipped or failed, we don't want to mark
+  results.testResults.forEach(({fullName, status, failing}) => {
+    if (
+      status === 'pending' ||
+      status === 'failed' ||
+      (failing && status === 'passed')
+    ) {
+      // If test is skipped or failed, we don't want to mark
       // its snapshots as obsolete.
+      // When tests called with test.failing pass, they've thrown an exception,
+      // so maintain any snapshots after the error.
       snapshotState.markSnapshotsAsCheckedForTest(fullName);
     }
   });

packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts

@@ -174,6 +174,7 @@ export const runAndTransformResultsToJestFormat = async ({
       return {
         ancestorTitles,
         duration: testResult.duration,
+        failing: testResult.failing,
         failureDetails: testResult.errorsDetailed,
         failureMessages: testResult.errors,
         fullName: title
@@ -237,7 +238,10 @@ const handleSnapshotStateAfterRetry =
 const eventHandler = async (event: Circus.Event) => {
   switch (event.name) {
     case 'test_start': {
-      jestExpect.setState({currentTestName: getTestID(event.test)});
+      jestExpect.setState({
+        currentTestName: getTestID(event.test),
+        testFailing: event.test.failing,
+      });
       break;
     }
     case 'test_done': {

packages/jest-circus/src/utils.ts

@@ -375,6 +375,7 @@ export const makeSingleTestResult = (
     duration: test.duration,
     errors: errorsDetailed.map(getErrorStack),
     errorsDetailed,
+    failing: test.failing,
     invocations: test.invocations,
     location,
     numPassingAsserts: test.numPassingAsserts,
@@ -509,6 +510,7 @@ export const parseSingleTestResult = (
   return {
     ancestorTitles,
     duration: testResult.duration,
+    failing: testResult.failing,
     failureDetails: testResult.errorsDetailed,
     failureMessages: Array.from(testResult.errors),
     fullName,

packages/jest-expect/src/types.ts

@@ -50,6 +50,8 @@ type PromiseMatchers<T = unknown> = {
 declare module 'expect' {
   interface MatcherState {
     snapshotState: SnapshotState;
+    /** Whether the test was called with `test.failing()` */
+    testFailing?: boolean;
   }
   interface BaseExpect {
     addSnapshotSerializer: typeof addSerializer;

packages/jest-snapshot/src/State.ts

@@ -36,6 +36,7 @@ export type SnapshotMatchOptions = {
   readonly inlineSnapshot?: string;
   readonly isInline: boolean;
   readonly error?: Error;
+  readonly pure?: boolean;
 };
 
 type SnapshotReturnOptions = {
@@ -197,6 +198,7 @@ export default class SnapshotState {
     inlineSnapshot,
     isInline,
     error,
+    pure = false,
   }: SnapshotMatchOptions): SnapshotReturnOptions {
     this._counters.set(testName, (this._counters.get(testName) || 0) + 1);
     const count = Number(this._counters.get(testName));
@@ -230,6 +232,23 @@ export default class SnapshotState {
       this._snapshotData[key] = receivedSerialized;
     }
 
+    // In pure runs, return the match result while skipping any updates
+    // reports.
+    if (pure) {
+      if (hasSnapshot && !isInline) {
+        // Retain current snapshot values.
+        this._addSnapshot(key, expected, {error, isInline});
+      }
+      return {
+        actual: removeExtraLineBreaks(receivedSerialized),
+        count,
+        expected:
+          expected !== undefined ? removeExtraLineBreaks(expected) : undefined,
+        key,
+        pass,
+      };
+    }
+
     // These are the conditions on when to write snapshots:
     //  * There's no snapshot file in a non-CI environment.
     //  * There is a snapshot file and we decided to update the snapshot.

packages/jest-snapshot/src/index.ts

@@ -277,7 +277,23 @@ const _toMatchSnapshot = (config: MatchSnapshotConfig) => {
     config;
   let {received} = config;
 
-  context.dontThrow && context.dontThrow();
+  /** If a test was ran with `test.failing`. Passed by Jest Circus. */
+  const {testFailing = false} = context;
+
+  /**
+   * Run the snapshot matcher as a normal throwing matcher with
+   * no side effects and no error supression.
+   *
+   * Skipped side effects occur in {@link snapshotState.match}
+   * and include updating the snapshot and recording passed/failed
+   * snapshots in the snapshot state.
+   */
+  const pure = testFailing;
+
+  if (!pure && context.dontThrow) {
+    // Supress errors while running tests
+    context.dontThrow();
+  }
 
   const {currentConcurrentTestName, isNot, snapshotState} = context;
   const currentTestName =
@@ -358,6 +374,7 @@ const _toMatchSnapshot = (config: MatchSnapshotConfig) => {
     error: context.error,
     inlineSnapshot,
     isInline,
+    pure,
     received,
     testName: fullTestName,
   });

packages/jest-snapshot/src/types.ts

@@ -11,6 +11,7 @@ import type SnapshotState from './State';
 
 export interface Context extends MatcherContext {
   snapshotState: SnapshotState;
+  testFailing?: boolean;
 }
 
 // This is typically implemented by `jest-haste-map`'s `HasteFS`, but we

packages/jest-test-result/src/types.ts

@@ -91,6 +91,11 @@ export type TestResult = {
   console?: ConsoleBuffer;
   coverage?: CoverageMapData;
   displayName?: Config.DisplayName;
+  /**
+   * Whether [`test.failing()`](https://jestjs.io/docs/api#testfailingname-fn-timeout)
+   * was used.
+   */
+  failing?: boolean;
   failureMessage?: string | null;
   leaks: boolean;
   memoryUsage?: number;

packages/jest-types/src/Circus.ts

@@ -197,6 +197,11 @@ export type TestResult = {
   duration?: number | null;
   errors: Array<FormattedError>;
   errorsDetailed: Array<MatcherResults | unknown>;
+  /**
+   * Whether [`test.failing()`](https://jestjs.io/docs/api#testfailingname-fn-timeout)
+   * was used.
+   */
+  failing?: boolean;
   invocations: number;
   status: TestStatus;
   location?: {column: number; line: number} | null;

packages/jest-types/src/TestResult.ts

@@ -23,6 +23,11 @@ type Callsite = {
 export type AssertionResult = {
   ancestorTitles: Array<string>;
   duration?: number | null;
+  /**
+   * Whether [`test.failing()`](https://jestjs.io/docs/api#testfailingname-fn-timeout)
+   * was used.
+   */
+  failing?: boolean;
   failureDetails: Array<unknown>;
   failureMessages: Array<string>;
   fullName: string;