particle-os/debian-image-builder-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: Fix async logic in Oscap flakes

Browse source 
`remove profile` and `change profile` test in `Oscap.test.tsx` suite were flaking for Node 18.x, this should fix the issue.
This commit is contained in:
regexowl 2024-07-30 09:19:52 +02:00 • committed by Klara Simickova
parent 68b7444b2f
commit 37dfe8584c
1 changed files with 76 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

150
src/test/Components/CreateImageWizard/steps/Oscap/Oscap.test.tsx
View file

@ -5,12 +5,12 @@ import { CREATE_BLUEPRINT, EDIT_BLUEPRINT } from '../../../../../constants';
import { CreateBlueprintRequest } from '../../../../../store/imageBuilderApi';
import { mockBlueprintIds } from '../../../../fixtures/blueprints';
import {
//baseCreateBlueprintRequest,
//expectedFilesystemCisL2,
//expectedKernelCisL2,
//expectedOpenscapCisL2,
//expectedPackagesCisL2,
//expectedServicesCisL2,
baseCreateBlueprintRequest,
expectedFilesystemCisL2,
expectedKernelCisL2,
expectedOpenscapCisL2,
expectedPackagesCisL2,
expectedServicesCisL2,
oscapCreateBlueprintRequest,
} from '../../../../fixtures/editMode';
import { clickNext } from '../../../../testUtils';
@ -73,36 +73,36 @@ const selectProfile = async () => {
const selectProfileDropdown = await screen.findByRole('textbox', {
name: /select a profile/i,
});
await waitFor(async () => await user.click(selectProfileDropdown));
await waitFor(() => user.click(selectProfileDropdown));
const cis1Profile = await screen.findByText(
/cis red hat enterprise linux 8 benchmark for level 1 - workstation/i
);
await waitFor(async () => user.click(cis1Profile));
await waitFor(() => user.click(cis1Profile));
};
// const selectDifferentProfile = async () => {
// const user = userEvent.setup();
// const selectProfileDropdown = await screen.findByRole('textbox', {
// name: /select a profile/i,
// });
// await waitFor(async () => user.click(selectProfileDropdown));
//
// const cis2Profile = await screen.findByText(
// /cis red hat enterprise linux 8 benchmark for level 2 - workstation/i
// );
// await waitFor(async () => user.click(cis2Profile));
// };
//
// const selectNone = async () => {
// const user = userEvent.setup();
// const selectProfileDropdown = await screen.findByRole('textbox', {
// name: /select a profile/i,
// });
// await waitFor(async () => user.click(selectProfileDropdown));
//
// await waitFor(async () => user.click(await screen.findByText(/none/i)));
// };
const selectDifferentProfile = async () => {
const user = userEvent.setup();
const selectProfileDropdown = await screen.findByRole('textbox', {
name: /select a profile/i,
});
await waitFor(() => user.click(selectProfileDropdown));
const cis2Profile = await screen.findByText(
/cis red hat enterprise linux 8 benchmark for level 2 - workstation/i
);
await waitFor(() => user.click(cis2Profile));
};
const selectNone = async () => {
const user = userEvent.setup();
const selectProfileDropdown = await screen.findByRole('textbox', {
name: /select a profile/i,
});
await waitFor(() => user.click(selectProfileDropdown));
await waitFor(async () => user.click(await screen.findByText(/none/i)));
};
const goToReviewStep = async () => {
await clickNext(); // File system configuration
@ -135,52 +135,54 @@ describe('oscap', () => {
...oscapCreateBlueprintRequest,
name: 'Oscap test',
};
expect(receivedRequest).toEqual(expectedRequest);
await waitFor(() => {
expect(receivedRequest).toEqual(expectedRequest);
});
});
// test('remove a profile', async () => {
// await renderCreateMode();
// await goToOscapStep();
// await selectProfile();
// await selectNone();
// await goToReviewStep();
//
// const receivedRequest = await interceptBlueprintRequest(CREATE_BLUEPRINT);
//
// const expectedRequest: CreateBlueprintRequest = {
// ...baseCreateBlueprintRequest,
// name: 'Oscap test',
// };
//
// expect(receivedRequest).toEqual(expectedRequest);
// });
//
// test('change profile', async () => {
// await renderCreateMode();
// await goToOscapStep();
// await selectProfile();
// await selectDifferentProfile();
// await goToReviewStep();
//
// const receivedRequest = await interceptBlueprintRequest(CREATE_BLUEPRINT);
//
// const expectedRequest: CreateBlueprintRequest = {
// ...baseCreateBlueprintRequest,
// customizations: {
// packages: expectedPackagesCisL2,
// openscap: expectedOpenscapCisL2,
// services: expectedServicesCisL2,
// kernel: expectedKernelCisL2,
// filesystem: expectedFilesystemCisL2,
// },
// name: 'Oscap test',
// };
//
// await waitFor(() => {
// expect(receivedRequest).toEqual(expectedRequest);
// });
// });
test('remove a profile', { retry: 3, timeout: 20000 }, async () => {
await renderCreateMode();
await goToOscapStep();
await selectProfile();
await selectNone();
await goToReviewStep();
const receivedRequest = await interceptBlueprintRequest(CREATE_BLUEPRINT);
const expectedRequest: CreateBlueprintRequest = {
...baseCreateBlueprintRequest,
name: 'Oscap test',
};
await waitFor(() => {
expect(receivedRequest).toEqual(expectedRequest);
});
});
test('change profile', { retry: 3, timeout: 20000 }, async () => {
await renderCreateMode();
await goToOscapStep();
await selectProfile();
await selectDifferentProfile();
await goToReviewStep();
const receivedRequest = await interceptBlueprintRequest(CREATE_BLUEPRINT);
const expectedRequest: CreateBlueprintRequest = {
...baseCreateBlueprintRequest,
customizations: {
packages: expectedPackagesCisL2,
openscap: expectedOpenscapCisL2,
services: expectedServicesCisL2,
kernel: expectedKernelCisL2,
filesystem: expectedFilesystemCisL2,
},
name: 'Oscap test',
};
await waitFor(() => {
expect(receivedRequest).toEqual(expectedRequest);
});
});
});
describe('OpenSCAP edit mode', () => {