Skip to content

Commit 9f06799

Browse files
authored
Add skipped tab in test report (microsoft#963)
1 parent 2fc25e8 commit 9f06799

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

resources/templates/report.pug

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,22 @@ html(lang="en")
3535
body.container-fluid
3636
ul.nav.nav-pills.mt-3(role='tablist')
3737
li.nav-item
38-
button.btn.btn-sm.btn-info.active(id='all-tab', data-toggle='pill', href='#all', role='tab', aria-controls='all') All
38+
button.btn.btn-sm.btn-info.active.mr-2.mb-2(id='all-tab', data-toggle='pill', href='#all', role='tab', aria-controls='all') All
3939
span.badge.badge-light.ml-2 #{allCount}
4040
if failedCount
4141
li.nav-item
42-
button.btn.btn-sm.btn-danger.ml-3(id='fail-tab', data-toggle='pill', href='#fail', role='tab', aria-controls='fail') Failed
42+
button.btn.btn-sm.btn-danger.mr-2.mb-2(id='fail-tab', data-toggle='pill', href='#fail', role='tab', aria-controls='fail') Failed
4343
span.badge.badge-light.ml-2 #{failedCount}
4444
if passedCount
4545
li.nav-item
46-
button.btn.btn-sm.btn-success.ml-3(id='pass-tab', data-toggle='pill', href='#pass', role='tab', aria-controls='pass') Passed
46+
button.btn.btn-sm.btn-success.mr-2.mb-2(id='pass-tab', data-toggle='pill', href='#pass', role='tab', aria-controls='pass') Passed
4747
span.badge.badge-light.ml-2 #{passedCount}
48+
if skippedCount
49+
li.nav-item
50+
button.btn.btn-sm.btn-secondary.mb-2(id='skip-tab', data-toggle='pill', href='#skip', role='tab', aria-controls='skip') Skipped
51+
span.badge.badge-light.ml-2 #{skippedCount}
4852

49-
div.tab-content.mt-3
53+
div.tab-content
5054
div.tab-pane.fade.show.active(id='all', role='tabpanel', aria-labelledby='all-tab')
5155
+collapseMethodTable(tests, 'detail-all')
5256
if failedCount
@@ -55,3 +59,6 @@ html(lang="en")
5559
if passedCount
5660
div.tab-pane.fade(id='pass', role='tabpanel', aria-labelledby='pass-tab')
5761
+collapseMethodTable(passedTests, 'detail-pass')
62+
if skippedCount
63+
div.tab-pane.fade(id='skip', role='tabpanel', aria-labelledby='skip-tab')
64+
+collapseMethodTable(skippedTests, 'detail-skip')

resources/templates/report_method_table.pug

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ mixin collapseMethodTable(children, type)
1111
- methodIdx++
1212
li.list-group-item.list-group-item-action
1313
div.row.accordion-toggle
14-
div.col-8.text-truncate.collapsed(data-toggle="collapse", data-target=`#${type}-${classIdx}-${methodIdx}`, style="cursor:pointer", title="View details")
14+
div.col-7.text-truncate.px-1.collapsed(data-toggle="collapse", data-target=`#${type}-${classIdx}-${methodIdx}`, style="cursor:pointer", title="View details")
1515
include /images/chevron-right.svg
1616
span.ml-1 #{method.displayName}
17-
div.col-1.text-right.p-0
17+
div.col-2.text-right.p-0
1818
if !method.status
1919
span.badge.badge-warning Not run
2020
else if method.status === 'Pass'
@@ -23,8 +23,8 @@ mixin collapseMethodTable(children, type)
2323
span.badge.badge-danger Failed
2424
else
2525
span.badge.badge-secondary Skipped
26-
div.col-2.text-right #{method.duration >= 0 ? parseFloat((method.duration/1000).toFixed(2)) + "s" : "N/A"}
27-
div.col-1.text-right.pl-0
26+
div.col-2.text-right.p-0 #{method.duration >= 0 ? parseFloat((method.duration/1000).toFixed(2)) + "s" : "N/A"}
27+
div.col-1.text-right.px-1
2828
a(href="#", title="Navigate to Source", uri=`${method.location && method.location.uri ? method.location.uri : ''}`, range=`${method.location && method.location.range ? JSON.stringify(method.location.range) : ''}`, fullname=`${method.fullName}`)
2929
include /images/go-to-file.svg
3030
div.mt-2.pl-2.accordion-body(id=`${type}-${classIdx}-${methodIdx}`, class="collapse")

src/testReportProvider.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ class TestReportProvider implements Disposable {
8989
const allResultsMap: Map<string, ITestReportItem[]> = new Map();
9090
const passedResultMap: Map<string, ITestReportItem[]> = new Map();
9191
const failedResultMap: Map<string, ITestReportItem[]> = new Map();
92+
const skippedResultMap: Map<string, ITestReportItem[]> = new Map();
9293
let passedCount: number = 0;
9394
let failedCount: number = 0;
9495
let skippedCount: number = 0;
@@ -115,6 +116,7 @@ class TestReportProvider implements Disposable {
115116
failedCount++;
116117
break;
117118
case TestStatus.Skip:
119+
this.putMethodResultIntoMap(skippedResultMap, reportItem, classFullName);
118120
skippedCount++;
119121
break;
120122
}
@@ -125,6 +127,7 @@ class TestReportProvider implements Disposable {
125127
tests: allResultsMap,
126128
passedTests: passedResultMap,
127129
failedTests: failedResultMap,
130+
skippedTests: skippedResultMap,
128131
allCount: testResults.length,
129132
passedCount,
130133
failedCount,

0 commit comments

Comments
 (0)