packages,plugins: migrate to using TestApiProvider and Registry

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

plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx

@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  ApiProvider,
-  ApiRegistry,
-  ConfigReader,
-} from '@backstage/core-app-api';
+import { ApiProvider, ConfigReader } from '@backstage/core-app-api';
 import {
   ConfigApi,
   configApiRef,
@@ -30,7 +26,11 @@ import {
   DefaultStarredEntitiesApi,
   starredEntitiesApiRef,
 } from '@backstage/plugin-catalog-react';
-import { MockStorageApi, renderInTestApp } from '@backstage/test-utils';
+import {
+  MockStorageApi,
+  renderInTestApp,
+  TestApiRegistry,
+} from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import { rootDocsRouteRef } from '../../routes';
@@ -69,12 +69,12 @@ describe('TechDocs Home', () => {
 
   const storageApi = MockStorageApi.create();
 
-  const apiRegistry = ApiRegistry.from([
+  const apiRegistry = TestApiRegistry.from(
     [catalogApiRef, mockCatalogApi],
     [configApiRef, configApi],
     [storageApiRef, storageApi],
     [starredEntitiesApiRef, new DefaultStarredEntitiesApi({ storageApi })],
-  ]);
+  );
 
   it('should render a TechDocs home page', async () => {
     await renderInTestApp(

plugins/techdocs/src/home/components/LegacyTechDocsHome.test.tsx

@@ -15,16 +15,12 @@
  */
 
 import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import { LegacyTechDocsHome } from './LegacyTechDocsHome';
 
-import {
-  ApiProvider,
-  ApiRegistry,
-  ConfigReader,
-} from '@backstage/core-app-api';
+import { ApiProvider, ConfigReader } from '@backstage/core-app-api';
 import { ConfigApi, configApiRef } from '@backstage/core-plugin-api';
 import { rootDocsRouteRef } from '../../routes';
 
@@ -59,10 +55,10 @@ describe('Legacy TechDocs Home', () => {
     },
   });
 
-  const apiRegistry = ApiRegistry.from([
+  const apiRegistry = TestApiRegistry.from(
     [catalogApiRef, mockCatalogApi],
     [configApiRef, configApi],
-  ]);
+  );
 
   it('should render a TechDocs home page', async () => {
     await renderInTestApp(

plugins/techdocs/src/home/components/TechDocsCustomHome.test.tsx

@@ -15,11 +15,11 @@
  */
 
 import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import { TechDocsCustomHome, PanelType } from './TechDocsCustomHome';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { ApiProvider } from '@backstage/core-app-api';
 import { rootDocsRouteRef } from '../../routes';
 
 jest.mock('@backstage/plugin-catalog-react', () => {
@@ -47,7 +47,7 @@ const mockCatalogApi = {
 } as Partial<CatalogApi>;
 
 describe('TechDocsCustomHome', () => {
-  const apiRegistry = ApiRegistry.with(catalogApiRef, mockCatalogApi);
+  const apiRegistry = TestApiRegistry.from([catalogApiRef, mockCatalogApi]);
 
   it('should render a TechDocs home page', async () => {
     const tabsConfig = [

plugins/techdocs/src/reader/components/Reader.test.tsx

@@ -19,12 +19,12 @@ import {
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { TestApiRegistry, wrapInTestApp } from '@backstage/test-utils';
 import { act, render } from '@testing-library/react';
 import React from 'react';
 import { TechDocsStorageApi, techdocsStorageApiRef } from '../../api';
 import { Reader } from './Reader';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { ApiProvider } from '@backstage/core-app-api';
 import { searchApiRef } from '@backstage/plugin-search';
 
 jest.mock('react-router-dom', () => {
@@ -57,11 +57,11 @@ describe('<Reader />', () => {
           results: [],
         }),
     };
-    const apiRegistry = ApiRegistry.from([
+    const apiRegistry = TestApiRegistry.from(
       [scmIntegrationsApiRef, scmIntegrationsApi],
       [techdocsStorageApiRef, techdocsStorageApi],
       [searchApiRef, searchApi],
-    ]);
+    );
 
     await act(async () => {
       const rendered = render(

plugins/techdocs/src/reader/components/TechDocsPage.test.tsx

@@ -21,7 +21,7 @@ import {
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { TestApiRegistry, wrapInTestApp } from '@backstage/test-utils';
 import { Header } from '@backstage/core-components';
 import {
   techdocsApiRef,
@@ -29,7 +29,7 @@ import {
   techdocsStorageApiRef,
   TechDocsStorageApi,
 } from '../../api';
-import { ApiRegistry, ApiProvider } from '@backstage/core-app-api';
+import { ApiProvider } from '@backstage/core-app-api';
 import { searchApiRef } from '@backstage/plugin-search';
 
 jest.mock('react-router-dom', () => {
@@ -90,12 +90,12 @@ describe('<TechDocsPage />', () => {
           results: [],
         }),
     };
-    const apiRegistry = ApiRegistry.from([
+    const apiRegistry = TestApiRegistry.from(
       [scmIntegrationsApiRef, scmIntegrationsApi],
       [techdocsApiRef, techdocsApi],
       [techdocsStorageApiRef, techdocsStorageApi],
       [searchApiRef, searchApi],
-    ]);
+    );
 
     await act(async () => {
       const rendered = render(
@@ -147,12 +147,12 @@ describe('<TechDocsPage />', () => {
           results: [],
         }),
     };
-    const apiRegistry = ApiRegistry.from([
+    const apiRegistry = TestApiRegistry.from(
       [scmIntegrationsApiRef, scmIntegrationsApi],
       [techdocsApiRef, techdocsApi],
       [techdocsStorageApiRef, techdocsStorageApi],
       [searchApiRef, searchApi],
-    ]);
+    );
 
     await act(async () => {
       const rendered = render(

plugins/techdocs/src/reader/components/TechDocsSearch.test.tsx

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { ApiProvider } from '@backstage/core-app-api';
 import { searchApiRef } from '@backstage/plugin-search';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { TestApiRegistry, wrapInTestApp } from '@backstage/test-utils';
 import {
   act,
   fireEvent,
@@ -54,7 +54,7 @@ describe('<TechDocsPage />', () => {
     const querySpy = jest.fn(query);
     const searchApi = { query: querySpy };
 
-    const apiRegistry = ApiRegistry.from([[searchApiRef, searchApi]]);
+    const apiRegistry = TestApiRegistry.from([searchApiRef, searchApi]);
 
     await act(async () => {
       const rendered = render(
@@ -75,7 +75,7 @@ describe('<TechDocsPage />', () => {
     const querySpy = jest.fn(query);
     const searchApi = { query: querySpy };
 
-    const apiRegistry = ApiRegistry.from([[searchApiRef, searchApi]]);
+    const apiRegistry = TestApiRegistry.from([searchApiRef, searchApi]);
 
     await act(async () => {
       const rendered = render(

plugins/techdocs/src/reader/components/useReaderState.test.tsx

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 import { NotFoundError } from '@backstage/errors';
+import { TestApiProvider } from '@backstage/test-utils';
 import { act, renderHook } from '@testing-library/react-hooks';
 import React from 'react';
 import { techdocsStorageApiRef } from '../../api';
@@ -38,10 +38,10 @@ describe('useReaderState', () => {
   };
 
   beforeEach(() => {
-    const apis = ApiRegistry.with(techdocsStorageApiRef, techdocsStorageApi);
-
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <ApiProvider apis={apis}>{children}</ApiProvider>
+      <TestApiProvider apis={[[techdocsStorageApiRef, techdocsStorageApi]]}>
+        {children}
+      </TestApiProvider>
     );
   });