diff --git a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html
index 377ecdb70..feea24147 100644
--- a/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html
+++ b/modules/ui/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html
@@ -28,10 +28,23 @@
-
{{ getTestStatusText(data) }}
-
- {{ getTestStatus(data) }}
-
+
+
{{ getTestStatusText(data) }}
+
+ {{ getTestStatus(data) }}
+
+
+
+
Preliminary Pilot Recommendation
+
+ {{ data.status }}
+
+
{
'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', () => {
@@ -191,14 +202,6 @@ describe('ProgressStatusCardComponent', () => {
expect(result).toEqual(expectedText);
});
-
- it('"Preliminary Pilot Recommendation" if finished and Pilot statuses', () => {
- const expectedText = 'Preliminary Pilot Recommendation';
-
- const result = component.getTestStatusText(MOCK_PROGRESS_DATA_PROCEED);
-
- expect(result).toEqual(expectedText);
- });
});
describe('#getTestStatus', () => {
@@ -448,5 +451,36 @@ describe('ProgressStatusCardComponent', () => {
expect(progressCardStatusText?.textContent).toEqual('Monitoring');
});
});
+
+ describe('with available systemStatus$ data, as "Proceed"', () => {
+ beforeEach(() => {
+ component.systemStatus = MOCK_PROGRESS_DATA_PROCEED;
+ fixture.detectChanges();
+ });
+
+ it('should have status', () => {
+ const titleEl = compiled.querySelectorAll(
+ '.progress-card-info-status .progress-card-info-title'
+ )[0];
+ const textEl = compiled.querySelectorAll(
+ '.progress-card-info-status .progress-card-info-text'
+ )[0];
+
+ expect(titleEl.textContent).toEqual('Result');
+ expect(textEl.textContent).toEqual('Compliant');
+ });
+
+ it('should have Pilot recommendations', () => {
+ const titleEl = compiled.querySelectorAll(
+ '.progress-card-info-status .progress-card-info-title'
+ )[1];
+ const textEl = compiled.querySelectorAll(
+ '.progress-card-info-status .progress-card-info-text'
+ )[1];
+
+ expect(titleEl.textContent).toEqual('Preliminary Pilot Recommendation');
+ expect(textEl.textContent).toEqual('Proceed');
+ });
+ });
});
});
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..da0b10bc6 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,
};
}
@@ -113,19 +114,17 @@ export class TestrunStatusCardComponent {
public getTestStatusText(data: TestrunStatus): string {
if (!data.finished) {
return 'Status';
- } else if (
- data.finished &&
- (data.status === StatusOfTestrun.Proceed ||
- data.status === StatusOfTestrun.DoNotProceed)
- ) {
- return 'Preliminary Pilot Recommendation';
} else {
return 'Result';
}
}
public getTestStatus(data: TestrunStatus): string {
- if (data.status === StatusOfTestrun.Complete) {
+ if (
+ data.status === StatusOfTestrun.Complete ||
+ data.status === StatusOfTestrun.Proceed ||
+ data.status === StatusOfTestrun.DoNotProceed
+ ) {
return data.result!;
}
return data.status;