From c5207e818fc99cb8b60d366fbb077334f586c29f Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 23 Aug 2022 17:08:42 +0200
Subject: [PATCH] core-app-api: FlatRoutes compat test fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Fredrik Adelöw <freben@gmail.com>
Co-authored-by: blam <ben@blam.sh>
Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../core-app-api/src/routing/FlatRoutes.compat.test.tsx   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/core-app-api/src/routing/FlatRoutes.compat.test.tsx b/packages/core-app-api/src/routing/FlatRoutes.compat.test.tsx
index f889019550..5d2ca15672 100644
--- a/packages/core-app-api/src/routing/FlatRoutes.compat.test.tsx
+++ b/packages/core-app-api/src/routing/FlatRoutes.compat.test.tsx
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-import { render, RenderResult } from '@testing-library/react';
+import tlr, { render, RenderResult } from '@testing-library/react';
 import React, { ReactNode } from 'react';
 import { LocalStorageFeatureFlags } from '../apis';
 import { featureFlagsApiRef } from '@backstage/core-plugin-api';
 import { AppContext } from '../app';
 import { AppContextProvider } from '../app/AppContext';
-import { TestApiProvider } from '@backstage/test-utils';
 
 describe.each(['beta', 'stable'])('FlatRoutes %s', rrVersion => {
   beforeAll(() => {
     jest.doMock('react', () => React);
+    // This has some side effects, so need this to be stable to avoid re-require
+    jest.doMock('@testing-library/react', () => tlr);
     jest.doMock('react-router', () =>
       rrVersion === 'beta'
         ? jest.requireActual('react-router-beta')
@@ -50,11 +51,12 @@ describe.each(['beta', 'stable'])('FlatRoutes %s', rrVersion => {
     return {
       ...(require('./FlatRoutes') as typeof import('./FlatRoutes')),
       ...(require('react-router-dom') as typeof import('react-router-dom')),
+      ...(require('@backstage/test-utils') as typeof import('@backstage/test-utils')),
     };
   }
 
   function makeRouteRenderer(node: ReactNode) {
-    const { MemoryRouter } = requireDeps();
+    const { MemoryRouter, TestApiProvider } = requireDeps();
     let rendered: RenderResult | undefined = undefined;
 
     const Wrapper = ({ children }: { children?: React.ReactNode }) => (