From 479282f38e0fcd60385059a6e93bb7cf99910f10 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 27 Feb 2026 21:13:25 +0100
Subject: [PATCH] frontend-test-utils: fix TestApiPair type inference for tuple
 syntax

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/fix-test-api-pair-inference.md                 | 5 +++++
 .changeset/fix-test-api-provider-const.md                 | 5 -----
 .patches/pr-33057.txt                                     | 1 +
 packages/frontend-test-utils/report.api.md                | 2 +-
 packages/frontend-test-utils/src/apis/TestApiProvider.tsx | 2 +-
 packages/test-utils/report.api.md                         | 4 ++--
 packages/test-utils/src/testUtils/TestApiProvider.tsx     | 4 ++--
 7 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/fix-test-api-pair-inference.md
 delete mode 100644 .changeset/fix-test-api-provider-const.md
 create mode 100644 .patches/pr-33057.txt

diff --git a/.changeset/fix-test-api-pair-inference.md b/.changeset/fix-test-api-pair-inference.md
new file mode 100644
index 0000000000..d527a27600
--- /dev/null
+++ b/.changeset/fix-test-api-pair-inference.md
@@ -0,0 +1,5 @@
+---
+'@backstage/frontend-test-utils': patch
+---
+
+Fixed type inference of `TestApiPair` when using tuple syntax by wrapping `MockWithApiFactory` in `NoInfer`.
diff --git a/.changeset/fix-test-api-provider-const.md b/.changeset/fix-test-api-provider-const.md
deleted file mode 100644
index b2bc0f49cd..0000000000
--- a/.changeset/fix-test-api-provider-const.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/test-utils': patch
----
-
-Added `const` type parameter modifier to `TestApiProvider` and `TestApiRegistry.from` for improved type inference of API pairs.
diff --git a/.patches/pr-33057.txt b/.patches/pr-33057.txt
new file mode 100644
index 0000000000..3499e84a89
--- /dev/null
+++ b/.patches/pr-33057.txt
@@ -0,0 +1 @@
+Fixed a type inference issue with the `apis` option of testing utilities in `@backstage/frontend-test-utils`.
\ No newline at end of file
diff --git a/packages/frontend-test-utils/report.api.md b/packages/frontend-test-utils/report.api.md
index 1cba02f393..a17c2ed483 100644
--- a/packages/frontend-test-utils/report.api.md
+++ b/packages/frontend-test-utils/report.api.md
@@ -443,7 +443,7 @@ export type RenderTestAppOptions<TApiPairs extends any[] = any[]> = {
 // @public
 export type TestApiPair<TApi> =
   | readonly [ApiRef<TApi>, TApi extends infer TImpl ? Partial<TImpl> : never]
-  | MockWithApiFactory<TApi>;
+  | MockWithApiFactory<NoInfer<TApi>>;
 
 // @public
 export type TestApiPairs<TApiPairs> = {
diff --git a/packages/frontend-test-utils/src/apis/TestApiProvider.tsx b/packages/frontend-test-utils/src/apis/TestApiProvider.tsx
index 215e8c8a71..d0eca87a33 100644
--- a/packages/frontend-test-utils/src/apis/TestApiProvider.tsx
+++ b/packages/frontend-test-utils/src/apis/TestApiProvider.tsx
@@ -29,7 +29,7 @@ import {
  */
 export type TestApiPair<TApi> =
   | readonly [ApiRef<TApi>, TApi extends infer TImpl ? Partial<TImpl> : never]
-  | MockWithApiFactory<TApi>;
+  | MockWithApiFactory<NoInfer<TApi>>;
 
 /**
  * Represents an array of mock API implementation.
diff --git a/packages/test-utils/report.api.md b/packages/test-utils/report.api.md
index f830cde655..b3cf84b5ae 100644
--- a/packages/test-utils/report.api.md
+++ b/packages/test-utils/report.api.md
@@ -340,7 +340,7 @@ export function setupRequestMockHandlers(worker: {
 export type SyncLogCollector = () => void;
 
 // @public
-export const TestApiProvider: <const T extends any[]>(
+export const TestApiProvider: <T extends any[]>(
   props: TestApiProviderProps<T>,
 ) => JSX_2.Element;
 
@@ -352,7 +352,7 @@ export type TestApiProviderProps<TApiPairs extends any[]> = {
 
 // @public
 export class TestApiRegistry implements ApiHolder {
-  static from<const TApiPairs extends any[]>(
+  static from<TApiPairs extends any[]>(
     ...apis: readonly [...TestApiProviderPropsApiPairs<TApiPairs>]
   ): TestApiRegistry;
   get<T>(api: ApiRef<T>): T | undefined;
diff --git a/packages/test-utils/src/testUtils/TestApiProvider.tsx b/packages/test-utils/src/testUtils/TestApiProvider.tsx
index 63e8a56f3b..18a7174201 100644
--- a/packages/test-utils/src/testUtils/TestApiProvider.tsx
+++ b/packages/test-utils/src/testUtils/TestApiProvider.tsx
@@ -63,7 +63,7 @@ export class TestApiRegistry implements ApiHolder {
    * @public
    * @param apis - A list of pairs mapping an ApiRef to its respective implementation.
    */
-  static from<const TApiPairs extends any[]>(
+  static from<TApiPairs extends any[]>(
     ...apis: readonly [...TestApiProviderPropsApiPairs<TApiPairs>]
   ) {
     return new TestApiRegistry(
@@ -124,7 +124,7 @@ export class TestApiRegistry implements ApiHolder {
  *
  * @public
  */
-export const TestApiProvider = <const T extends any[]>(
+export const TestApiProvider = <T extends any[]>(
   props: TestApiProviderProps<T>,
 ) => {
   return (