Merge branch 'main' into mk/Feature-14943-Support-outputFile-option-f…

…or-listTests

CHANGELOG.md

@@ -42,6 +42,7 @@
 - `[jest-config]` Support `testTimeout` in project config ([#14697](https://github.com/jestjs/jest/pull/14697))
 - `[jest-config]` Support `coverageReporters` in project config ([#14697](https://github.com/jestjs/jest/pull/14830))
 - `[jest-config]` Allow `reporters` in project config ([#14768](https://github.com/jestjs/jest/pull/14768))
+- `[jest-each]` Allow `$keypath` templates with `null` or `undefined` values ([#14831](https://github.com/jestjs/jest/pull/14831))
 - `[@jest/expect-utils]` Fix comparison of `DataView` ([#14408](https://github.com/jestjs/jest/pull/14408))
 - `[@jest/expect-utils]` [**BREAKING**] exclude non-enumerable in object matching ([#14670](https://github.com/jestjs/jest/pull/14670))
 - `[@jest/expect-utils]` Fix comparison of `URL` ([#14672](https://github.com/jestjs/jest/pull/14672))

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

@@ -1,5 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`allows nullable or undefined args when templating object each args 1`] = `
+"PASS __tests__/eachTemplate.test.js
+  ✓ allows templating "value"
+  ✓ allows templating "null"
+  ✓ allows templating "undefined"
+  ✓ allows templating "1"
+  ✓ allows templating "null"
+  ✓ allows templating "undefined""
+`;
+
 exports[`formats args with pretty format when given %p 1`] = `
 "PASS __tests__/pretty.test.js
   array

e2e/__tests__/each.test.ts

@@ -60,3 +60,10 @@ test('formats args with pretty format when given %p', () => {
   expect(rest).toMatchSnapshot();
   expect(result.exitCode).toBe(0);
 });
+
+test('allows nullable or undefined args when templating object each args', () => {
+  const result = runJest(dir, ['eachTemplate.test.js']);
+  const {rest} = extractSummary(result.stderr);
+  expect(rest).toMatchSnapshot();
+  expect(result.exitCode).toBe(0);
+});

e2e/each/__tests__/eachTemplate.test.js

@@ -0,0 +1,21 @@
+/**
+ * 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.
+ */
+
+it.each([
+  {something: {nested: 'value'}},
+  {something: null},
+  {something: undefined},
+])('allows templating "$something.nested"', value => {
+  expect(value).toBe(value);
+});
+
+it.each([{array: ['some value']}, {array: null}, {array: undefined}])(
+  'allows templating "$array.length"',
+  value => {
+    expect(value).toBe(value);
+  },
+);

jest.config.ts.mjs

@@ -35,8 +35,10 @@ export default {
         '!**/packages/jest-cli/__typetests__/*.test.ts',
         '!**/packages/jest-expect/__typetests__/*.test.ts',
         '!**/packages/jest-mock/__typetests__/*.test.ts',
+        '!**/packages/jest-runner/__typetests__/*.test.ts',
         '!**/packages/jest-snapshot/__typetests__/*.test.ts',
         '!**/packages/jest-types/__typetests__/config.test.ts',
+        '!**/packages/jest-types/__typetests__/jest.test.ts',
         '!**/packages/jest-worker/__typetests__/*.test.ts',
       ],
     },

packages/jest-each/src/__tests__/template.test.ts

@@ -417,6 +417,30 @@ describe('jest-each', () => {
         );
       });
 
+      test.each([null, undefined])(
+        'calls global with title containing $key.path for %s',
+        value => {
+          const globalTestMocks = getGlobalTestMocks();
+          const eachObject = each.withGlobal(globalTestMocks)`
+          a
+          ${{foo: value}}
+        `;
+          const testFunction = get(eachObject, keyPath);
+          testFunction(
+            'interpolates object keyPath to value: $a.foo.bar',
+            noop,
+          );
+
+          const globalMock = get(globalTestMocks, keyPath);
+          expect(globalMock).toHaveBeenCalledTimes(1);
+          expect(globalMock).toHaveBeenCalledWith(
+            `interpolates object keyPath to value: ${value}`,
+            expectFunction,
+            undefined,
+          );
+        },
+      );
+
       test('calls global with title containing last seen object when $key.path is invalid', () => {
         const globalTestMocks = getGlobalTestMocks();
         const eachObject = each.withGlobal(globalTestMocks)`

packages/jest-each/src/table/interpolation.ts

@@ -71,6 +71,8 @@ export function getPath(
   template: Template,
   [head, ...tail]: Array<string>,
 ): unknown {
+  if (template === null) return 'null';
+  if (template === undefined) return 'undefined';
   if (!head || !Object.prototype.hasOwnProperty.call(template, head))
     return template;
   return getPath(template[head] as Template, tail);

packages/jest-runner/__typetests__/jest-runner.test.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {expectType} from 'tsd-lite';
+import {expect} from 'tstyche';
 import {
   CallbackTestRunner,
   type CallbackTestRunnerInterface,
@@ -37,17 +37,17 @@ class CallbackRunner extends CallbackTestRunner {
     onFailure: OnTestFailure,
     options: TestRunnerOptions,
   ): Promise<void> {
-    expectType<Config.GlobalConfig>(this._globalConfig);
-    expectType<TestRunnerContext>(this._context);
+    expect(this._globalConfig).type.toEqual<Config.GlobalConfig>();
+    expect(this._context).type.toEqual<TestRunnerContext>();
 
     return;
   }
 }
 
 const callbackRunner = new CallbackRunner(globalConfig, runnerContext);
 
-expectType<boolean | undefined>(callbackRunner.isSerial);
-expectType<false>(callbackRunner.supportsEventEmitters);
+expect(callbackRunner.isSerial).type.toEqual<boolean | undefined>();
+expect(callbackRunner.supportsEventEmitters).type.toEqual<false>();
 
 // CallbackTestRunnerInterface
 
@@ -68,8 +68,8 @@ class CustomCallbackRunner implements CallbackTestRunnerInterface {
     onFailure: OnTestFailure,
     options: TestRunnerOptions,
   ): Promise<void> {
-    expectType<Config.GlobalConfig>(this.#globalConfig);
-    expectType<number>(this.#maxConcurrency);
+    expect(this.#globalConfig).type.toEqual<Config.GlobalConfig>();
+    expect(this.#maxConcurrency).type.toBeNumber();
 
     return;
   }
@@ -83,8 +83,8 @@ class EmittingRunner extends EmittingTestRunner {
     watcher: TestWatcher,
     options: TestRunnerOptions,
   ): Promise<void> {
-    expectType<Config.GlobalConfig>(this._globalConfig);
-    expectType<TestRunnerContext>(this._context);
+    expect(this._globalConfig).type.toEqual<Config.GlobalConfig>();
+    expect(this._context).type.toEqual<TestRunnerContext>();
 
     return;
   }
@@ -99,8 +99,8 @@ class EmittingRunner extends EmittingTestRunner {
 
 const emittingRunner = new EmittingRunner(globalConfig, runnerContext);
 
-expectType<boolean | undefined>(emittingRunner.isSerial);
-expectType<true>(emittingRunner.supportsEventEmitters);
+expect(emittingRunner.isSerial).type.toEqual<boolean | undefined>();
+expect(emittingRunner.supportsEventEmitters).type.toEqual<true>();
 
 // EmittingTestRunnerInterface
 
@@ -119,8 +119,8 @@ class CustomEmittingRunner implements EmittingTestRunnerInterface {
     watcher: TestWatcher,
     options: TestRunnerOptions,
   ): Promise<void> {
-    expectType<Config.GlobalConfig>(this.#globalConfig);
-    expectType<number>(this.#maxConcurrency);
+    expect(this.#globalConfig).type.toEqual<Config.GlobalConfig>();
+    expect(this.#maxConcurrency).type.toBeNumber();
 
     return;
   }