packages,plugins: migrate to using TestApiProvider and Registry

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

plugins/explore/src/components/DefaultExplorePage/DefaultExplorePage.test.tsx

@@ -15,11 +15,10 @@
  */
 
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor, getByText } from '@testing-library/react';
 import React from 'react';
 import { DefaultExplorePage } from './DefaultExplorePage';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<DefaultExplorePage />', () => {
   const catalogApi: jest.Mocked<typeof catalogApiRef.T> = {
@@ -36,9 +35,9 @@ describe('<DefaultExplorePage />', () => {
   };
 
   const Wrapper = ({ children }: { children?: React.ReactNode }) => (
-    <ApiProvider apis={ApiRegistry.with(catalogApiRef, catalogApi)}>
+    <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
       {children}
-    </ApiProvider>
+    </TestApiProvider>
   );
 
   beforeEach(() => {

plugins/explore/src/components/DomainExplorerContent/DomainExplorerContent.test.tsx

@@ -16,12 +16,11 @@
 
 import { DomainEntity } from '@backstage/catalog-model';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { catalogEntityRouteRef } from '../../routes';
 import { DomainExplorerContent } from './DomainExplorerContent';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<DomainExplorerContent />', () => {
   const catalogApi: jest.Mocked<typeof catalogApiRef.T> = {
@@ -38,9 +37,9 @@ describe('<DomainExplorerContent />', () => {
   };
 
   const Wrapper = ({ children }: { children?: React.ReactNode }) => (
-    <ApiProvider apis={ApiRegistry.with(catalogApiRef, catalogApi)}>
+    <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
       {children}
-    </ApiProvider>
+    </TestApiProvider>
   );
 
   const mountedRoutes = {

plugins/explore/src/components/ExploreLayout/ExploreLayout.test.tsx

@@ -14,16 +14,12 @@
  * limitations under the License.
  */
 
-import {
-  ApiProvider,
-  ApiRegistry,
-  FeatureFlagged,
-} from '@backstage/core-app-api';
+import { FeatureFlagged } from '@backstage/core-app-api';
 import {
   FeatureFlagsApi,
   featureFlagsApiRef,
 } from '@backstage/core-plugin-api';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ExploreLayout } from './ExploreLayout';
@@ -35,11 +31,11 @@ const featureFlagsApi: jest.Mocked<FeatureFlagsApi> = {
   registerFlag: jest.fn(),
 };
 
-const mockApis = ApiRegistry.with(featureFlagsApiRef, featureFlagsApi);
-
 describe('<ExploreLayout />', () => {
   const Wrapper = ({ children }: { children?: React.ReactNode }) => (
-    <ApiProvider apis={mockApis}>{children}</ApiProvider>
+    <TestApiProvider apis={[[featureFlagsApiRef, featureFlagsApi]]}>
+      {children}
+    </TestApiProvider>
   );
 
   afterEach(() => {

plugins/explore/src/components/GroupsExplorerContent/GroupsDiagram.test.tsx

@@ -20,10 +20,9 @@ import {
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
 import { Entity } from '@backstage/catalog-model';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import React from 'react';
 import { GroupsDiagram } from './GroupsDiagram';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<GroupsDiagram />', () => {
   beforeAll(() => {
@@ -57,9 +56,9 @@ describe('<GroupsDiagram />', () => {
     };
 
     const { getByText } = await renderInTestApp(
-      <ApiProvider apis={ApiRegistry.from([[catalogApiRef, catalogApi]])}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <GroupsDiagram />
-      </ApiProvider>,
+      </TestApiProvider>,
       {
         mountedRoutes: {
           '/catalog/:namespace/:kind/:name': entityRouteRef,

plugins/explore/src/components/GroupsExplorerContent/GroupsExplorerContent.test.tsx

@@ -16,11 +16,10 @@
 
 import { Entity } from '@backstage/catalog-model';
 import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { GroupsExplorerContent } from '../GroupsExplorerContent';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<GroupsExplorerContent />', () => {
   const catalogApi: jest.Mocked<typeof catalogApiRef.T> = {
@@ -37,9 +36,9 @@ describe('<GroupsExplorerContent />', () => {
   };
 
   const Wrapper = ({ children }: { children?: React.ReactNode }) => (
-    <ApiProvider apis={ApiRegistry.with(catalogApiRef, catalogApi)}>
+    <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
       {children}
-    </ApiProvider>
+    </TestApiProvider>
   );
 
   const mountedRoutes = {

plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.test.tsx

@@ -18,13 +18,12 @@ import {
   ExploreTool,
   exploreToolsConfigRef,
 } from '@backstage/plugin-explore-react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { lightTheme } from '@backstage/theme';
 import { ThemeProvider } from '@material-ui/core';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ToolExplorerContent } from './ToolExplorerContent';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<ToolExplorerContent />', () => {
   const exploreToolsConfigApi: jest.Mocked<typeof exploreToolsConfigRef.T> = {
@@ -33,11 +32,9 @@ describe('<ToolExplorerContent />', () => {
 
   const Wrapper = ({ children }: { children?: React.ReactNode }) => (
     <ThemeProvider theme={lightTheme}>
-      <ApiProvider
-        apis={ApiRegistry.with(exploreToolsConfigRef, exploreToolsConfigApi)}
-      >
+      <TestApiProvider apis={[[exploreToolsConfigRef, exploreToolsConfigApi]]}>
         {children}
-      </ApiProvider>
+      </TestApiProvider>
     </ThemeProvider>
   );