Skip to content

Filter Not Started tests from test count #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sofyakurilova merged 3 commits into from
Sep 16, 2024
Merged

Filter Not Started tests from test count #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6a5c34
Filter Not Started tests from test count
sofyakurilova Sep 16, 2024
7d42c11
Merge branch 'dev' into bug/tests_count
sofyakurilova Sep 16, 2024
010dfba
Merge branch 'dev' into bug/tests_count
sofyakurilova Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion modules/ui/src/app/mocks/testrun.mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ export const TEST_DATA_RESULT: IResult[] = [
'The device should use the DNS server provided by the DHCP server',
result: 'Non-Compliant',
},
{
name: 'dns.mdns',
description: 'Does the device has MDNS (or any kind of IP multicast)',
result: 'Not Started',
},
];

export const TEST_DATA_RESULT_WITH_RECOMMENDATIONS: IResult[] = [
Expand All @@ -50,7 +55,7 @@ export const TEST_DATA_RESULT_WITH_RECOMMENDATIONS: IResult[] = [

export const TEST_DATA_TABLE_RESULT: IResult[] = [
...TEST_DATA_RESULT,
...new Array(24).fill(null).map(() => ({}) as IResult),
...new Array(23).fill(null).map(() => ({}) as IResult),
];

export const EMPTY_RESULT = new Array(100)
Expand Down
2 changes: 1 addition & 1 deletion ...rc/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ describe('ProgressStatusCardComponent', () => {
});

it('should return correct test result if status "Compliant"', () => {
const expectedResult = '2/2';
const expectedResult = '2/3';

const result = component.getTestsResult(MOCK_PROGRESS_DATA_COMPLIANT);

Expand Down
13 changes: 10 additions & 3 deletions .../ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import {
IResult,
StatusOfTestResult,
StatusOfTestrun,
TestrunStatus,
TestsData,
Expand Down Expand Up @@ -65,11 +66,11 @@ export class TestrunStatusCardComponent {
(data.tests as TestsData)?.results?.length &&
(data.tests as TestsData)?.total
) {
return `${(data.tests as TestsData)?.results?.length}/${
return `${(data.tests as TestsData)?.results?.filter(result => result.result !== StatusOfTestResult.NotStarted).length}/${
(data.tests as TestsData)?.total
}`;
} else if ((data.tests as IResult[])?.length) {
return `${(data.tests as IResult[])?.length}/${
return `${(data.tests as IResult[])?.filter(result => result.result !== StatusOfTestResult.NotStarted).length}/${
(data.tests as IResult[])?.length
}`;
}
Expand Down Expand Up @@ -99,7 +100,13 @@ export class TestrunStatusCardComponent {
const testData = data.tests as TestsData;

if (testData && testData.total && testData.results?.length) {
return Math.round((testData.results.length / testData.total) * 100);
return Math.round(
(testData.results.filter(
result => result.result !== StatusOfTestResult.NotStarted
).length /
testData.total) *
100
);
}
return 0;
}
Expand Down