Skip to content

Cancelled status: empty table #337

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 2 commits into from
Mar 20, 2024
Merged

Cancelled status: empty table #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fb0353
Adds empty table for cancelled state (if no tests are available)
sofyakurilova Mar 18, 2024
3025735
Merge branch 'dev' into bug/cancelled_empty_table
jboddey Mar 19, 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
3 changes: 3 additions & 0 deletions modules/ui/src/app/mocks/progress.mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ export const MOCK_PROGRESS_DATA_COMPLIANT: TestrunStatus =
export const MOCK_PROGRESS_DATA_CANCELLED: TestrunStatus =
PROGRESS_DATA_RESPONSE(StatusOfTestrun.Cancelled, null, TEST_DATA);

export const MOCK_PROGRESS_DATA_CANCELLED_EMPTY: TestrunStatus =
PROGRESS_DATA_RESPONSE(StatusOfTestrun.Cancelled, null, []);

export const MOCK_PROGRESS_DATA_MONITORING: TestrunStatus =
PROGRESS_DATA_RESPONSE(StatusOfTestrun.Monitoring, null, TEST_DATA);

Expand Down
14 changes: 14 additions & 0 deletions modules/ui/src/app/pages/testrun/progress.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { of } from 'rxjs';
import {
EMPTY_RESULT,
MOCK_PROGRESS_DATA_CANCELLED,
MOCK_PROGRESS_DATA_CANCELLED_EMPTY,
MOCK_PROGRESS_DATA_CANCELLING,
MOCK_PROGRESS_DATA_COMPLIANT,
MOCK_PROGRESS_DATA_IN_PROGRESS,
Expand Down Expand Up @@ -240,6 +241,19 @@ describe('ProgressComponent', () => {
expect(res).toEqual(expectedResult);
});
});

it('should set value with empty values for status "Cancelled" and empty result', () => {
const expectedResult = EMPTY_RESULT;

testRunServiceMock.systemStatus$ = of(
MOCK_PROGRESS_DATA_CANCELLED_EMPTY
);
component.ngOnInit();

component.dataSource$.subscribe(res => {
expect(res).toEqual(expectedResult);
});
});
});

it('should call focusFirstElementInContainer when testrun stops after cancelling', () => {
Expand Down
3 changes: 2 additions & 1 deletion modules/ui/src/app/pages/testrun/progress.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ export class ProgressComponent implements OnInit, OnDestroy {
const results = (res.tests as TestsData)?.results || [];
if (
res.status === StatusOfTestrun.Monitoring ||
res.status === StatusOfTestrun.WaitingForDevice
res.status === StatusOfTestrun.WaitingForDevice ||
(res.status === StatusOfTestrun.Cancelled && !results.length)
) {
return EMPTY_RESULT;
}
Expand Down