packages,plugins: migrate to using TestApiProvider and Registry

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

plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx

@@ -17,8 +17,8 @@ import React from 'react';
 import { ScaffolderApi, scaffolderApiRef } from '../../api';
 import { ActionsPage } from './ActionsPage';
 import { rootRouteRef } from '../../routes';
-import { renderInTestApp } from '@backstage/test-utils';
-import { ApiRegistry, ApiProvider } from '@backstage/core-app-api';
+import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
+import { ApiProvider } from '@backstage/core-app-api';
 
 const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
   scaffold: jest.fn(),
@@ -29,7 +29,7 @@ const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
   listActions: jest.fn(),
 };
 
-const apis = ApiRegistry.from([[scaffolderApiRef, scaffolderApiMock]]);
+const apis = TestApiRegistry.from([scaffolderApiRef, scaffolderApiMock]);
 
 describe('TemplatePage', () => {
   beforeEach(() => jest.resetAllMocks());

plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx

@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { renderInTestApp, renderWithEffects } from '@backstage/test-utils';
+import {
+  renderInTestApp,
+  renderWithEffects,
+  TestApiRegistry,
+} from '@backstage/test-utils';
 import { lightTheme } from '@backstage/theme';
 import { ThemeProvider } from '@material-ui/core';
 import { fireEvent, within } from '@testing-library/react';
@@ -24,7 +28,7 @@ import { ScaffolderApi, scaffolderApiRef } from '../../api';
 import { rootRouteRef } from '../../routes';
 import { TemplatePage } from './TemplatePage';
 
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { ApiProvider } from '@backstage/core-app-api';
 import { errorApiRef } from '@backstage/core-plugin-api';
 
 jest.mock('react-router-dom', () => {
@@ -47,10 +51,10 @@ const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
 
 const errorApiMock = { post: jest.fn(), error$: jest.fn() };
 
-const apis = ApiRegistry.from([
+const apis = TestApiRegistry.from(
   [scaffolderApiRef, scaffolderApiMock],
   [errorApiRef, errorApiMock],
-]);
+);
 
 describe('TemplatePage', () => {
   beforeEach(() => jest.resetAllMocks());

plugins/scaffolder/src/components/TemplateTypePicker/TemplateTypePicker.test.tsx

@@ -26,8 +26,8 @@ import {
   MockEntityListContextProvider,
 } from '@backstage/plugin-catalog-react';
 import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
-import { renderWithEffects } from '@backstage/test-utils';
+import { ApiProvider } from '@backstage/core-app-api';
+import { renderWithEffects, TestApiRegistry } from '@backstage/test-utils';
 
 const entities: Entity[] = [
   {
@@ -62,7 +62,7 @@ const entities: Entity[] = [
   },
 ];
 
-const apis = ApiRegistry.from([
+const apis = TestApiRegistry.from(
   [
     catalogApiRef,
     {
@@ -77,7 +77,7 @@ const apis = ApiRegistry.from([
       post: jest.fn(),
     } as unknown as AlertApi,
   ],
-]);
+);
 
 describe('<TemplateTypePicker/>', () => {
   it('renders available entity types', async () => {

plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx

@@ -16,12 +16,11 @@
 
 import { Entity } from '@backstage/catalog-model';
 import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { FieldProps } from '@rjsf/core';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { EntityPicker } from './EntityPicker';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 const makeEntity = (kind: string, namespace: string, name: string): Entity => ({
   apiVersion: 'backstage.io/v1beta1',
@@ -53,14 +52,15 @@ describe('<EntityPicker />', () => {
   let Wrapper: React.ComponentType;
 
   beforeEach(() => {
-    const apis = ApiRegistry.with(catalogApiRef, catalogApi);
     entities = [
       makeEntity('Group', 'default', 'team-a'),
       makeEntity('Group', 'default', 'squad-b'),
     ];
 
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <ApiProvider apis={apis}>{children}</ApiProvider>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+        {children}
+      </TestApiProvider>
     );
   });
 

plugins/scaffolder/src/components/fields/OwnerPicker/OwnerPicker.test.tsx

@@ -16,11 +16,10 @@
 
 import { Entity } from '@backstage/catalog-model';
 import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { FieldProps } from '@rjsf/core';
 import React from 'react';
 import { OwnerPicker } from './OwnerPicker';
-import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 const makeEntity = (kind: string, namespace: string, name: string): Entity => ({
   apiVersion: 'backstage.io/v1beta1',
@@ -50,14 +49,15 @@ describe('<OwnerPicker />', () => {
   let Wrapper: React.ComponentType;
 
   beforeEach(() => {
-    const apis = ApiRegistry.with(catalogApiRef, catalogApi);
     entities = [
       makeEntity('Group', 'default', 'team-a'),
       makeEntity('Group', 'default', 'squad-b'),
     ];
 
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <ApiProvider apis={apis}>{children}</ApiProvider>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+        {children}
+      </TestApiProvider>
     );
   });