@@ -37,6 +37,7 @@ import { TestListView } from './uiModeTestListView';
37
37
import { TraceView } from './uiModeTraceView' ;
38
38
import { SettingsView } from './settingsView' ;
39
39
import { DefaultSettingsView } from './defaultSettingsView' ;
40
+ import { testStatusIcon } from './testUtils' ;
40
41
41
42
let xtermSize = { cols : 80 , rows : 24 } ;
42
43
const xtermDataSource : XtermDataSource = {
@@ -461,11 +462,18 @@ export const UIModeView: React.FC<{}> = ({
461
462
runTests = { ( ) => runTests ( 'bounce-if-busy' , visibleTestIds ) } />
462
463
< Toolbar noMinHeight = { true } >
463
464
{ ! isRunningTest && ! progress && < div className = 'section-title' > Tests</ div > }
464
- { ! isRunningTest && progress && < div data-testid = 'status-line' className = 'status-line' >
465
- < div > { progress . passed } /{ progress . total } passed ({ ( progress . passed / progress . total ) * 100 | 0 } %)</ div >
465
+ { ! isRunningTest && progress && < div data-testid = 'status-line' className = 'status-line' title = { `${ progress . passed } passed, ${ progress . failed } failed, ${ progress . skipped } skipped` } >
466
+ < span data-testid = 'test-count' > { progress . passed + progress . failed + progress . skipped } /{ progress . total } </ span >
467
+ < div className = 'status-passed' > < span className = { clsx ( 'codicon' , testStatusIcon ( 'passed' ) ) } /> { progress . passed } </ div >
468
+ < div className = 'status-failed' > < span className = { clsx ( 'codicon' , testStatusIcon ( 'failed' ) ) } /> { progress . failed } </ div >
469
+ < div className = 'status-skipped' > < span className = { clsx ( 'codicon' , testStatusIcon ( 'skipped' ) ) } /> { progress . skipped } </ div >
466
470
</ div > }
467
- { isRunningTest && progress && < div data-testid = 'status-line' className = 'status-line' >
468
- < div > Running { progress . passed } /{ runningState . testIds . size } passed ({ ( progress . passed / runningState . testIds . size ) * 100 | 0 } %)</ div >
471
+ { isRunningTest && progress && < div data-testid = 'status-line' className = 'status-line' title = { `${ progress . passed } passed, ${ progress . failed } failed, ${ progress . skipped } skipped` } >
472
+ < span className = { clsx ( 'codicon' , testStatusIcon ( 'running' ) ) } />
473
+ < span data-testid = 'test-count' > { progress . passed + progress . failed + progress . skipped } /{ runningState . testIds . size } </ span >
474
+ < div className = 'status-passed' > < span className = { clsx ( 'codicon' , testStatusIcon ( 'passed' ) ) } /> { progress . passed } </ div >
475
+ < div className = 'status-failed' > < span className = { clsx ( 'codicon' , testStatusIcon ( 'failed' ) ) } /> { progress . failed } </ div >
476
+ < div className = 'status-skipped' > < span className = { clsx ( 'codicon' , testStatusIcon ( 'skipped' ) ) } /> { progress . skipped } </ div >
469
477
</ div > }
470
478
< ToolbarButton icon = 'play' title = 'Run all — F5' onClick = { ( ) => runTests ( 'bounce-if-busy' , visibleTestIds ) } disabled = { isRunningTest || isLoading } > </ ToolbarButton >
471
479
< ToolbarButton icon = 'debug-stop' title = { 'Stop — ' + ( isMac ? '⇧F5' : 'Shift + F5' ) } onClick = { ( ) => testServerConnection ?. stopTests ( { } ) } disabled = { ! isRunningTest || isLoading } > </ ToolbarButton >
0 commit comments