Commit 8399fb66 authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '249368-unit-test-report-test-cases-with-errored-status-show-skipped-icon' into 'master'

Unit Test Report: Fix icon for errored status

See merge request gitlab-org/gitlab!42540
parents 3e4b0007 f64ff999
...@@ -13,6 +13,8 @@ export const TestStatus = { ...@@ -13,6 +13,8 @@ export const TestStatus = {
FAILED: 'failed', FAILED: 'failed',
SKIPPED: 'skipped', SKIPPED: 'skipped',
SUCCESS: 'success', SUCCESS: 'success',
ERROR: 'error',
UNKNOWN: 'unknown',
}; };
export const FETCH_AUTHOR_ERROR_MESSAGE = __('There was a problem fetching project users.'); export const FETCH_AUTHOR_ERROR_MESSAGE = __('There was a problem fetching project users.');
......
import { __, sprintf } from '../../../locale'; import { __, sprintf } from '../../../locale';
import { TestStatus } from '../../constants';
export function iconForTestStatus(status) { export function iconForTestStatus(status) {
switch (status) { switch (status) {
case 'success': case TestStatus.SUCCESS:
return 'status_success_borderless'; return 'status_success_borderless';
case 'failed': case TestStatus.FAILED:
return 'status_failed_borderless'; return 'status_failed_borderless';
default: case TestStatus.ERROR:
return 'status_warning_borderless';
case TestStatus.SKIPPED:
return 'status_skipped_borderless'; return 'status_skipped_borderless';
case TestStatus.UNKNOWN:
default:
return 'status_notfound_borderless';
} }
} }
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
} }
} }
.ci-status-icon-error,
.ci-status-icon-failed { .ci-status-icon-failed {
svg { svg {
fill: $red-500; fill: $red-500;
......
---
title: 'Unit Test Report: Fix icon for errored status'
merge_request: 42540
author:
type: fixed
...@@ -9,4 +9,20 @@ export default [ ...@@ -9,4 +9,20 @@ export default [
status: TestStatus.SKIPPED, status: TestStatus.SKIPPED,
system_output: null, system_output: null,
}, },
{
classname: 'spec.test_spec',
execution_time: 0,
name: 'Test#error text',
stack_trace: null,
status: TestStatus.ERROR,
system_output: null,
},
{
classname: 'spec.test_spec',
execution_time: 0,
name: 'Test#unknown text',
stack_trace: null,
status: TestStatus.UNKNOWN,
system_output: null,
},
]; ];
...@@ -61,18 +61,17 @@ describe('Test reports suite table', () => { ...@@ -61,18 +61,17 @@ describe('Test reports suite table', () => {
expect(allCaseRows().length).toBe(testCases.length); expect(allCaseRows().length).toBe(testCases.length);
}); });
it('renders the correct icon for each status', () => { it.each([
const failedTest = testCases.findIndex(x => x.status === TestStatus.FAILED); TestStatus.ERROR,
const skippedTest = testCases.findIndex(x => x.status === TestStatus.SKIPPED); TestStatus.FAILED,
const successTest = testCases.findIndex(x => x.status === TestStatus.SUCCESS); TestStatus.SKIPPED,
TestStatus.SUCCESS,
'unknown',
])('renders the correct icon for test case with %s status', status => {
const test = testCases.findIndex(x => x.status === status);
const row = findCaseRowAtIndex(test);
const failedRow = findCaseRowAtIndex(failedTest); expect(findIconForRow(row, status).exists()).toBe(true);
const skippedRow = findCaseRowAtIndex(skippedTest);
const successRow = findCaseRowAtIndex(successTest);
expect(findIconForRow(failedRow, TestStatus.FAILED).exists()).toBe(true);
expect(findIconForRow(skippedRow, TestStatus.SKIPPED).exists()).toBe(true);
expect(findIconForRow(successRow, TestStatus.SUCCESS).exists()).toBe(true);
}); });
}); });
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment