From 8afb3dcf0a937f388114cd2c9ee39e1d72c9f049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Fri, 2 Jun 2023 14:04:41 +0200 Subject: [PATCH] fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .../src/components/ApisCards/ConsumedApisCard.test.tsx | 9 ++------- .../src/components/ApisCards/HasApisCard.test.tsx | 9 ++------- .../src/components/ApisCards/ProvidedApisCard.test.tsx | 9 ++------- .../ComponentsCards/ConsumingComponentsCard.test.tsx | 9 ++------- .../ComponentsCards/ProvidingComponentsCard.test.tsx | 9 ++------- .../DependencyOfComponentsCard.test.tsx | 8 +++++--- .../DependsOnComponentsCard.test.tsx | 8 +++++--- .../DependsOnResourcesCard.test.tsx | 8 +++++--- .../HasComponentsCard/HasComponentsCard.test.tsx | 8 +++++--- .../HasResourcesCard/HasResourcesCard.test.tsx | 8 +++++--- .../HasSubcomponentsCard/HasSubcomponentsCard.test.tsx | 8 +++++--- .../components/HasSystemsCard/HasSystemsCard.test.tsx | 8 +++++--- 12 files changed, 45 insertions(+), 56 deletions(-) diff --git a/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.test.tsx b/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.test.tsx index ea51d3989d..d664ce78e8 100644 --- a/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.test.tsx +++ b/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.test.tsx @@ -32,12 +32,7 @@ describe('', () => { getApiDefinitionWidget: jest.fn(), } as any; const catalogApi: jest.Mocked = { - getLocationById: jest.fn(), - getEntityByName: jest.fn(), - getEntities: jest.fn(), - addLocation: jest.fn(), - getLocationByRef: jest.fn(), - removeEntityByUid: jest.fn(), + getEntitiesByRefs: jest.fn(), } as any; let Wrapper: React.ComponentType>; @@ -99,7 +94,7 @@ describe('', () => { }, ], }; - catalogApi.getEntities.mockResolvedValue({ + catalogApi.getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/api-docs/src/components/ApisCards/HasApisCard.test.tsx b/plugins/api-docs/src/components/ApisCards/HasApisCard.test.tsx index 6ab55c5c66..169311d0c8 100644 --- a/plugins/api-docs/src/components/ApisCards/HasApisCard.test.tsx +++ b/plugins/api-docs/src/components/ApisCards/HasApisCard.test.tsx @@ -32,12 +32,7 @@ describe('', () => { getApiDefinitionWidget: jest.fn(), } as any; const catalogApi: jest.Mocked = { - getLocationById: jest.fn(), - getEntityByName: jest.fn(), - getEntities: jest.fn(), - addLocation: jest.fn(), - getLocationByRef: jest.fn(), - removeEntityByUid: jest.fn(), + getEntitiesByRefs: jest.fn(), } as any; let Wrapper: React.ComponentType>; @@ -99,7 +94,7 @@ describe('', () => { }, ], }; - catalogApi.getEntities.mockResolvedValue({ + catalogApi.getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.test.tsx b/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.test.tsx index 5f69e90f9f..3dbc4edd63 100644 --- a/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.test.tsx +++ b/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.test.tsx @@ -32,12 +32,7 @@ describe('', () => { getApiDefinitionWidget: jest.fn(), } as any; const catalogApi: jest.Mocked = { - getLocationById: jest.fn(), - getEntityByName: jest.fn(), - getEntities: jest.fn(), - addLocation: jest.fn(), - getLocationByRef: jest.fn(), - removeEntityByUid: jest.fn(), + getEntitiesByRefs: jest.fn(), } as any; let Wrapper: React.ComponentType>; @@ -99,7 +94,7 @@ describe('', () => { }, ], }; - catalogApi.getEntities.mockResolvedValue({ + catalogApi.getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/api-docs/src/components/ComponentsCards/ConsumingComponentsCard.test.tsx b/plugins/api-docs/src/components/ComponentsCards/ConsumingComponentsCard.test.tsx index f7a18cf671..20a60562b0 100644 --- a/plugins/api-docs/src/components/ComponentsCards/ConsumingComponentsCard.test.tsx +++ b/plugins/api-docs/src/components/ComponentsCards/ConsumingComponentsCard.test.tsx @@ -28,12 +28,7 @@ import { ConsumingComponentsCard } from './ConsumingComponentsCard'; describe('', () => { const catalogApi: jest.Mocked = { - getLocationById: jest.fn(), - getEntityByName: jest.fn(), - getEntities: jest.fn(), - addLocation: jest.fn(), - getLocationByRef: jest.fn(), - removeEntityByUid: jest.fn(), + getEntitiesByRefs: jest.fn(), } as any; let Wrapper: React.ComponentType>; @@ -102,7 +97,7 @@ describe('', () => { }, ], }; - catalogApi.getEntities.mockResolvedValue({ + catalogApi.getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/api-docs/src/components/ComponentsCards/ProvidingComponentsCard.test.tsx b/plugins/api-docs/src/components/ComponentsCards/ProvidingComponentsCard.test.tsx index 8b003bf2e2..0801d7103a 100644 --- a/plugins/api-docs/src/components/ComponentsCards/ProvidingComponentsCard.test.tsx +++ b/plugins/api-docs/src/components/ComponentsCards/ProvidingComponentsCard.test.tsx @@ -28,12 +28,7 @@ import { ProvidingComponentsCard } from './ProvidingComponentsCard'; describe('', () => { const catalogApi: jest.Mocked = { - getLocationById: jest.fn(), - getEntityByName: jest.fn(), - getEntities: jest.fn(), - addLocation: jest.fn(), - getLocationByRef: jest.fn(), - removeEntityByUid: jest.fn(), + getEntitiesByRefs: jest.fn(), } as any; let Wrapper: React.ComponentType>; @@ -102,7 +97,7 @@ describe('', () => { }, ], }; - catalogApi.getEntities.mockResolvedValue({ + catalogApi.getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/catalog/src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.test.tsx b/plugins/catalog/src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.test.tsx index e5900d75e0..0ebda6e64d 100644 --- a/plugins/catalog/src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.test.tsx +++ b/plugins/catalog/src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.test.tsx @@ -27,12 +27,14 @@ import React from 'react'; import { DependencyOfComponentsCard } from './DependencyOfComponentsCard'; describe('', () => { - const getEntities: jest.MockedFunction = jest.fn(); + const getEntitiesByRefs: jest.MockedFunction< + CatalogApi['getEntitiesByRefs'] + > = jest.fn(); let Wrapper: React.ComponentType>; beforeEach(() => { Wrapper = ({ children }: { children?: React.ReactNode }) => ( - + {children} ); @@ -85,7 +87,7 @@ describe('', () => { }, ], }; - getEntities.mockResolvedValue({ + getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/catalog/src/components/DependsOnComponentsCard/DependsOnComponentsCard.test.tsx b/plugins/catalog/src/components/DependsOnComponentsCard/DependsOnComponentsCard.test.tsx index 9255ee4f36..ee8931143f 100644 --- a/plugins/catalog/src/components/DependsOnComponentsCard/DependsOnComponentsCard.test.tsx +++ b/plugins/catalog/src/components/DependsOnComponentsCard/DependsOnComponentsCard.test.tsx @@ -27,12 +27,14 @@ import React from 'react'; import { DependsOnComponentsCard } from './DependsOnComponentsCard'; describe('', () => { - const getEntities: jest.MockedFunction = jest.fn(); + const getEntitiesByRefs: jest.MockedFunction< + CatalogApi['getEntitiesByRefs'] + > = jest.fn(); let Wrapper: React.ComponentType>; beforeEach(() => { Wrapper = ({ children }: { children?: React.ReactNode }) => ( - + {children} ); @@ -85,7 +87,7 @@ describe('', () => { }, ], }; - getEntities.mockResolvedValue({ + getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx b/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx index 3b0d7dcff3..0e760f9155 100644 --- a/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx +++ b/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx @@ -27,12 +27,14 @@ import React from 'react'; import { DependsOnResourcesCard } from './DependsOnResourcesCard'; describe('', () => { - const getEntities: jest.MockedFunction = jest.fn(); + const getEntitiesByRefs: jest.MockedFunction< + CatalogApi['getEntitiesByRefs'] + > = jest.fn(); let Wrapper: React.ComponentType>; beforeEach(() => { Wrapper = ({ children }: { children?: React.ReactNode }) => ( - + {children} ); @@ -85,7 +87,7 @@ describe('', () => { }, ], }; - getEntities.mockResolvedValue({ + getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx index 3651421797..67c3f6b650 100644 --- a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx +++ b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx @@ -27,12 +27,14 @@ import React from 'react'; import { HasComponentsCard } from './HasComponentsCard'; describe('', () => { - const getEntities: jest.MockedFunction = jest.fn(); + const getEntitiesByRefs: jest.MockedFunction< + CatalogApi['getEntitiesByRefs'] + > = jest.fn(); let Wrapper: React.ComponentType>; beforeEach(() => { Wrapper = ({ children }: { children?: React.ReactNode }) => ( - + {children} ); @@ -85,7 +87,7 @@ describe('', () => { }, ], }; - getEntities.mockResolvedValue({ + getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx index 4bf6524a9c..d78d307c96 100644 --- a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx +++ b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx @@ -27,12 +27,14 @@ import React from 'react'; import { HasResourcesCard } from './HasResourcesCard'; describe('', () => { - const getEntities: jest.MockedFunction = jest.fn(); + const getEntitiesByRefs: jest.MockedFunction< + CatalogApi['getEntitiesByRefs'] + > = jest.fn(); let Wrapper: React.ComponentType>; beforeEach(() => { Wrapper = ({ children }: { children?: React.ReactNode }) => ( - + {children} ); @@ -80,7 +82,7 @@ describe('', () => { }, ], }; - getEntities.mockResolvedValue({ + getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx index 97e69e93d1..713313b7c6 100644 --- a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx +++ b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx @@ -27,12 +27,14 @@ import React from 'react'; import { HasSubcomponentsCard } from './HasSubcomponentsCard'; describe('', () => { - const getEntities: jest.MockedFunction = jest.fn(); + const getEntitiesByRefs: jest.MockedFunction< + CatalogApi['getEntitiesByRefs'] + > = jest.fn(); let Wrapper: React.ComponentType>; beforeEach(() => { Wrapper = ({ children }: { children?: React.ReactNode }) => ( - + {children} ); @@ -85,7 +87,7 @@ describe('', () => { }, ], }; - getEntities.mockResolvedValue({ + getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1', diff --git a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx index 224e0c6703..9844708f85 100644 --- a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx +++ b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx @@ -27,12 +27,14 @@ import React from 'react'; import { HasSystemsCard } from './HasSystemsCard'; describe('', () => { - const getEntities: jest.MockedFunction = jest.fn(); + const getEntitiesByRefs: jest.MockedFunction< + CatalogApi['getEntitiesByRefs'] + > = jest.fn(); let Wrapper: React.ComponentType>; beforeEach(() => { Wrapper = ({ children }: { children?: React.ReactNode }) => ( - + {children} ); @@ -85,7 +87,7 @@ describe('', () => { }, ], }; - getEntities.mockResolvedValue({ + getEntitiesByRefs.mockResolvedValue({ items: [ { apiVersion: 'v1',