Skip to content

Commit 086168a

Browse files
Romain Jametrjamet-ovh
authored andcommitted
fix(okms): fix kms tests
ref: #MANAGER-19793 Signed-off-by: Romain Jamet <[email protected]>
1 parent fff8eb1 commit 086168a

File tree

5 files changed

+28
-23
lines changed

5 files changed

+28
-23
lines changed

packages/manager/apps/okms/src/common/components/okmsDatagrid/OkmsDatagrid.component.spec.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ describe('Okms Datagrid tests suite', () => {
9595
expect(await screen.findAllByText(columns.servicekeyCount)).toHaveLength(1);
9696
expect(await screen.findAllByText(columns.region)).toHaveLength(1);
9797
expect(await screen.findAllByText(columns.status)).toHaveLength(1);
98-
expect(screen.getByTestId('header-action')).toBeVisible();
9998

10099
// hidden columns
101100
expect(screen.queryByText(columns.secretCount)).not.toBeInTheDocument();
@@ -114,6 +113,5 @@ describe('Okms Datagrid tests suite', () => {
114113
expect(screen.queryByText(columns.kmipCount)).not.toBeInTheDocument();
115114
expect(screen.queryByText(columns.servicekeyCount)).not.toBeInTheDocument();
116115
expect(screen.queryByText(columns.region)).not.toBeInTheDocument();
117-
expect(screen.queryByTestId('header-action')).not.toBeInTheDocument();
118116
});
119117
});

packages/manager/apps/okms/src/components/layout-helpers/Dashboard/KmsTabs.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ const KmsTabs: React.FC<KmsTabsProps> = ({ tabs }) => {
6767
>
6868
{tabs.map((tab: KmsTabProps, index) => (
6969
<OdsTab
70+
data-testid={tab.url}
7071
key={`ods-tab-bar-item-${tab.url}`}
7172
id={tab.url}
7273
isSelected={index === activeTabIndex}

packages/manager/apps/okms/src/mocks/services/services.mock.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { CurrencyCode, ServiceDetails } from '@ovh-ux/manager-react-components';
2+
import { okmsMock } from '../kms/okms.mock';
23

34
export const kmsServicesMock: ServiceDetails = {
45
route: {
@@ -68,7 +69,7 @@ export const kmsServicesMock: ServiceDetails = {
6869
engagementRequest: { pricingMode: '', requestDate: '' },
6970
},
7071
resource: {
71-
displayName: 'testkms123k',
72+
displayName: okmsMock[0].iam.displayName,
7273
name: '7f3a82ac-a8d8-4c2a-ab0c-f6e86ddf6a7c',
7374
state: 'active',
7475
product: {

packages/manager/apps/okms/src/modules/secret-manager/components/regionSelector/RegionSelector.component.spec.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
getOdsButtonByLabel,
1111
getOdsButtonByIcon,
1212
} from '@/utils/tests/uiTestHelpers';
13-
import { initTestI18n } from '@/utils/tests/init.i18n';
13+
import { initTestI18n, labels } from '@/utils/tests/init.i18n';
1414
import {
1515
GeographyGroup,
1616
RegionOption,
@@ -161,7 +161,7 @@ describe('RegionSelector Component', () => {
161161
const { container } = await renderRegionSelector();
162162

163163
// Then
164-
expect(screen.getByText('region')).toBeInTheDocument();
164+
expect(screen.getByText(labels.common.region.region)).toBeInTheDocument();
165165
await getOdsButtonByLabel({ container, label: mockCurrentRegion.label });
166166
});
167167

packages/manager/apps/okms/src/pages/dashboard/KmsDashboard.page.spec.tsx

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,17 @@ import { KMS_FEATURES } from '@/utils/feature-availability/feature-availability.
1313
import { SERVICE_KEYS_LABEL } from '@/constants';
1414
import { KMS_ROUTES_URLS } from '@/routes/routes.constants';
1515

16-
const mockPageUrl = KMS_ROUTES_URLS.kmsDashboard(okmsMock[0].id);
16+
const mockedOkms = okmsMock[0];
17+
const mockPageUrl = KMS_ROUTES_URLS.kmsDashboard(mockedOkms.id);
18+
19+
const generalInformationTabTestId = KMS_ROUTES_URLS.kmsDashboard(mockedOkms.id);
20+
const serviceKeyListTabTestId = KMS_ROUTES_URLS.serviceKeyListing(
21+
mockedOkms.id,
22+
);
23+
const credentialListTabTestId = KMS_ROUTES_URLS.credentialListing(
24+
mockedOkms.id,
25+
);
26+
const logTabTestId = KMS_ROUTES_URLS.kmsLogs(mockedOkms.id);
1727

1828
describe('KMS dashboard test suite', () => {
1929
it('should display an error if the API is KO', async () => {
@@ -34,14 +44,10 @@ describe('KMS dashboard test suite', () => {
3444

3545
await waitFor(
3646
() => {
37-
expect(
38-
screen.getAllByText(labels.dashboard.general_informations)[0],
39-
).toBeVisible();
40-
expect(screen.getByText(SERVICE_KEYS_LABEL)).toBeVisible();
41-
expect(
42-
screen.getByText(labels.dashboard.access_certificates),
43-
).toBeVisible();
44-
expect(screen.getByText(labels.dashboard.logs)).toBeVisible();
47+
expect(screen.getByTestId(generalInformationTabTestId)).toBeVisible();
48+
expect(screen.getByTestId(serviceKeyListTabTestId)).toBeVisible();
49+
expect(screen.getByTestId(credentialListTabTestId)).toBeVisible();
50+
expect(screen.getByTestId(logTabTestId)).toBeVisible();
4551
},
4652

4753
WAIT_FOR_DEFAULT_OPTIONS,
@@ -71,11 +77,15 @@ describe('KMS dashboard test suite', () => {
7177
await renderTestApp(mockPageUrl);
7278

7379
await waitFor(
74-
() => expect(screen.getByText(SERVICE_KEYS_LABEL)).toBeEnabled(),
80+
() => expect(screen.getByTestId(serviceKeyListTabTestId)).toBeEnabled(),
7581
WAIT_FOR_DEFAULT_OPTIONS,
7682
);
7783

78-
await waitFor(() => userEvent.click(screen.getByText(SERVICE_KEYS_LABEL)));
84+
await waitFor(() =>
85+
userEvent.click(
86+
screen.getByTestId(KMS_ROUTES_URLS.serviceKeyListing(mockedOkms.id)),
87+
),
88+
);
7989

8090
await waitFor(
8191
() =>
@@ -92,10 +102,7 @@ describe('KMS dashboard test suite', () => {
92102
await renderTestApp(mockPageUrl);
93103

94104
await waitFor(
95-
() =>
96-
expect(
97-
screen.getByText(labels.dashboard.access_certificates),
98-
).toBeEnabled(),
105+
() => expect(screen.getByTestId(credentialListTabTestId)).toBeEnabled(),
99106
WAIT_FOR_DEFAULT_OPTIONS,
100107
);
101108

@@ -128,9 +135,7 @@ describe('KMS dashboard test suite', () => {
128135
await assertOdsModalVisibility({ container, isVisible: true });
129136

130137
expect(
131-
await screen.findByText(
132-
labels.credentials.key_management_service_credential_dashboard_name,
133-
),
138+
await screen.findByText(labels.common.actions.modify_name),
134139
).toBeVisible();
135140
});
136141
});

0 commit comments

Comments
 (0)