From 1da329f4fc52bd5ef50e0b8647d5e72f3f116f9b Mon Sep 17 00:00:00 2001 From: kurilova Date: Tue, 1 Apr 2025 11:29:33 +0000 Subject: [PATCH 1/2] Change error status background --- .../testrun-status-card/testrun-status-card.component.scss | 4 ++++ .../testrun-status-card/testrun-status-card.component.ts | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss index 69b4d5ac1..3ebd248a7 100644 --- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss +++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss @@ -102,6 +102,10 @@ &.canceled .progress-card-info-status { background-color: colors.$on-surface; } + + &.error .progress-card-info-status { + background-color: colors.$on-surface-variant; + } } .progress-card-info-tests { 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 77ea36823..e44011d3f 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 @@ -66,6 +66,7 @@ export class TestrunStatusCardComponent { 'completed-success': boolean; 'completed-failed': boolean; canceled: boolean; + error: boolean; } { return { progress: this.isProgressStatus(status), @@ -79,11 +80,11 @@ export class TestrunStatusCardComponent { 'completed-failed': (result === ResultOfTestrun.NonCompliant && status === StatusOfTestrun.Complete) || - status === StatusOfTestrun.Error || status === StatusOfTestrun.DoNotProceed, canceled: status === StatusOfTestrun.Cancelled || status === StatusOfTestrun.Cancelling, + error: status === StatusOfTestrun.Error, }; } From 90f0d063eda2ce16b62c31404556fa97982eac4e Mon Sep 17 00:00:00 2001 From: kurilova Date: Tue, 1 Apr 2025 11:59:51 +0000 Subject: [PATCH 2/2] Fix tests --- .../testrun-status-card.component.spec.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 1c3c125c7..77eaf9da2 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 @@ -54,6 +54,7 @@ describe('ProgressStatusCardComponent', () => { 'completed-success': false, 'completed-failed': false, canceled: false, + error: false, }; const statusesForProgressClass = [ @@ -71,7 +72,6 @@ describe('ProgressStatusCardComponent', () => { const statusesForCompletedFailedClass = [ StatusOfTestrun.Complete, - StatusOfTestrun.Error, StatusOfTestrun.DoNotProceed, ]; @@ -127,6 +127,17 @@ describe('ProgressStatusCardComponent', () => { expect(result).toEqual(expectedResult); }); + + it('should have class "error" if status "Error"', () => { + const expectedResult = { + ...availableClasses, + error: true, + }; + + const result = component.getClass(StatusOfTestrun.Error); + + expect(result).toEqual(expectedResult); + }); }); describe('#getTestsResult', () => {