diff --git a/modules/ui/src/app/mocks/testrun.mock.ts b/modules/ui/src/app/mocks/testrun.mock.ts index f782c58f3..cdab57abb 100644 --- a/modules/ui/src/app/mocks/testrun.mock.ts +++ b/modules/ui/src/app/mocks/testrun.mock.ts @@ -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[] = [ @@ -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) diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts index 29fdd7731..3a58b20bc 100644 --- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts +++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts @@ -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); diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts index 027588b24..acc7c90bf 100644 --- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts +++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.ts @@ -16,6 +16,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { IResult, + StatusOfTestResult, StatusOfTestrun, TestrunStatus, TestsData, @@ -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 }`; } @@ -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; }