Skip to content

Commit 1559fba

Browse files
florystfloryst
committed
chore(packages): remove tap adapter + reporter
1 parent 5ab4f9a commit 1559fba

File tree

6 files changed

+99
-336
lines changed

6 files changed

+99
-336
lines changed

‎Utilities/Karma/reporting-template.html‎

Lines changed: 93 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,51 @@
77
}
88
body {
99
padding: 4px;
10+
font-family: sans-serif;
1011
}
1112
figcaption {
1213
text-align: center;
1314
}
14-
15+
button {
16+
padding: 4px;
17+
margin: 2px 6px;
18+
}
1519
.container {
1620
display: flex;
1721
flex-flow: column;
1822
}
23+
.indent {
24+
margin-left: 32px;
25+
}
1926
.line {
2027
border: 1px solid grey;
21-
font-family: sans-serif;
2228
font-size: 1em;
2329
padding: 6px 8px;
2430
display: flex;
2531
flex-flow: row;
2632
align-items: center;
2733
}
28-
.browser {
34+
.browser > .line {
2935
display: block;
3036
background: white;
3137
font-size: 1.25em;
3238
}
3339
.browser li {
3440
font-size: 0.8em;
3541
}
36-
.test {
37-
margin-left: 32px;
42+
.test > .line {
3843
font-size: 1.1em;
3944
}
40-
.test.success {
45+
.test.pass > .line {
4146
background: #98ff98;
4247
}
43-
.test.fail {
48+
.test.fail > .line {
4449
background: #ee0000;
4550
}
46-
.spec {
47-
margin-left: 64px;
48-
}
49-
.spec.success {
51+
.spec.pass > .line {
5052
background: #98ff9888;
5153
}
52-
.spec.fail {
54+
.spec.fail > .line {
5355
background: #ee000088;
5456
}
5557
.skip {
@@ -63,10 +65,15 @@
6365
padding: 4px;
6466
}
6567
.details {
66-
margin-left: 96px;
6768
padding: 8px;
6869
background: #eee;
6970
}
71+
.skip > .details, .pass > .details {
72+
display: none;
73+
}
74+
.fail > .details {
75+
display: block;
76+
}
7077
.imagediff {
7178
display: flex;
7279
flex-flow: row;
@@ -75,89 +82,111 @@
7582
margin-left: 8px;
7683
}
7784
.hidden {
78-
display: none;
85+
display: none !important;
86+
}
87+
.show-block {
88+
display: block !important;
7989
}
8090
#controls {
8191
padding: 8px;
8292
}
8393
</style>
8494
<script type="text/javascript">
85-
let showPassing = false;
86-
87-
function togglePassingVisible(forceFlag = undefined) {
88-
showPassing = forceFlag === undefined ? !showPassing : forceFlag;
89-
Array.from(document.querySelectorAll('.skip, .success')).forEach((el) => {
90-
if (showPassing) {
91-
el.classList.remove('hidden');
95+
// addOrRemove: true to add, false to remove
96+
function toggleClasses(query, classes, addOrRemove) {
97+
Array.from(document.querySelectorAll(query)).forEach((el) => {
98+
if (addOrRemove) {
99+
classes.forEach((cls) => el.classList.add(cls));
92100
} else {
93-
el.classList.add('hidden');
101+
classes.forEach((cls) => el.classList.remove(cls));
94102
}
95103
});
96-
document.getElementById('passingVisibleBtn').innerText = showPassing
104+
}
105+
106+
let showSuccess = false;
107+
function toggleSuccess(forceFlag = undefined) {
108+
showSuccess = forceFlag === undefined ? !showSuccess : forceFlag;
109+
toggleClasses('.skip, .pass', ['hidden'], !showSuccess);
110+
document.getElementById('toggleSuccessBtn').innerText = showSuccess
97111
? 'hide passing tests'
98112
: 'show passing tests';
99113
}
100114

115+
let showImages = false;
116+
function toggleImages(forceFlag = undefined) {
117+
showImages = forceFlag === undefined ? !showImages : forceFlag;
118+
toggleClasses('.details.operator-imagediff', ['show-block'], showImages);
119+
document.getElementById('toggleImagesBtn').innerText = showImages
120+
? 'hide passing image tests'
121+
: 'show all image tests';
122+
}
123+
101124
window.onload = () => {
102-
togglePassingVisible(true);
125+
toggleSuccess(true);
126+
toggleImages(false);
103127
};
104128
</script>
105129
</head>
106130
<body>
107131
<h1>vtk.js Test Results</h1>
108132
<div id="controls">
109-
<button id="passingVisibleBtn" onclick="togglePassingVisible()">loading</button>
133+
<button id="toggleSuccessBtn" onclick="toggleSuccess()">loading</button>
134+
<button id="toggleImagesBtn" onclick="toggleImages()">loading</button>
110135
</div>
111136
{{#each browsers}}
112-
<div class="line browser">
113-
<div>{{name}}</div>
114-
<ul>
115-
<li>Failed: {{summary.failed}}</li>
116-
<li>Passed: {{summary.passed}}</li>
117-
<li>Skipped: {{summary.skipped}}</li>
118-
<li>Total: {{summary.total}}</li>
119-
</ul>
120-
</div>
121-
{{#each tests}}
122-
<div class="line test {{#if success}}success{{else}}fail{{/if}}">
137+
<div class="browser">
138+
<div class="line">
139+
<div>{{name}}</div>
140+
<ul>
141+
<li>Failed: {{summary.failed}}</li>
142+
<li>Passed: {{summary.passed}}</li>
143+
<li>Skipped: {{summary.skipped}}</li>
144+
<li>Total: {{summary.total}}</li>
145+
</ul>
146+
</div>
147+
{{#each tests}}
148+
<div class="test indent {{#if success}}pass{{else}}fail{{/if}}">
149+
<div class="line">
123150
{{name}}
124151
{{#if success}}
125152
<div class="ml-8 badge">passing</div>
126153
{{else}}
127154
<div class="ml-8 badge">failing</div>
128155
{{/if}}
129156
</div>
130-
{{#each specs}}
131-
<div class="line spec {{#if skipped}}skip{{else if success}}success{{else}}fail{{/if}}">
132-
<div>{{description}}</div>
133-
{{#if skipped}}
134-
<div class="ml-8 badge">skipped</div>
135-
{{else if success}}
136-
<div class="ml-8 badge">passing</div>
137-
{{else}}
138-
<div class="ml-8 badge">failing</div>
139-
{{/if}}
140-
</div>
141-
{{#unless success}}
142-
<div class="details">
143-
{{#with details}}
144-
{{#if (equals operator "imagediff")}}
145-
{{! Image diff structure: see testUtils.compareImage }}
146-
<div>Mismatch count tolerance: {{expected}}%</div>
147-
<div class="imagediff">
148-
<figure><img src="{{actual.outputImage}}"><figcaption>Output</figcaption></figure>
149-
<figure><img src="{{actual.expectedImage}}"><figcaption>Expected</figcaption></figure>
150-
<figure><img src="{{actual.diffImage}}"><figcaption>Difference</figcaption></figure>
151-
</div>
157+
{{#each specs}}
158+
<div class="spec indent {{#if skipped}}skip{{else if success}}pass{{else}}fail{{/if}}">
159+
<div class="line">
160+
<div>{{description}}</div>
161+
{{#if skipped}}
162+
<div class="ml-8 badge">skipped</div>
163+
{{else if success}}
164+
<div class="ml-8 badge">passing</div>
152165
{{else}}
153-
<div>Output: <code>{{details.actual}}</code></div>
154-
<div>Expected: <code>{{details.expected}}</code></div>
166+
<div class="ml-8 badge">failing</div>
155167
{{/if}}
156-
{{/with}}
168+
</div>
169+
{{#with details}}
170+
<div class="details operator-{{operator}}">
171+
{{#if (equals operator "imagediff")}}
172+
{{! Image diff structure: see testUtils.compareImage }}
173+
<div>Mismatch count tolerance: {{expected}}%</div>
174+
<div class="imagediff">
175+
<figure><img src="{{actual.outputImage}}"><figcaption>Output</figcaption></figure>
176+
<figure><img src="{{actual.expectedImage}}"><figcaption>Expected</figcaption></figure>
177+
<figure><img src="{{actual.diffImage}}"><figcaption>Difference</figcaption></figure>
157178
</div>
158-
{{/unless}}
159-
{{/each}}
179+
{{else}}
180+
<div>Output: <code>{{details.actual}}</code></div>
181+
<div>Expected: <code>{{details.expected}}</code></div>
182+
{{/if}}
183+
</div>
184+
{{/with}}
185+
</div>
160186
{{/each}}
187+
</div>
188+
{{/each}}
189+
</div>
161190
{{/each}}
162-
</body>
191+
</body>
163192
</html>

‎Utilities/Karma/tap-object-html-reporter.js‎

Lines changed: 0 additions & 133 deletions
This file was deleted.

‎Utilities/Karma/tape-html-reporter.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ var TapeHTMLReporter = function(baseReporterDecorator, rootConfig, logger, helpe
7373
browser.tests.forEach((test) => {
7474
test.success = test.specs.reduce((yn, spec) => yn && spec.success, true);
7575
});
76+
77+
console.info(`Browser: ${browser.name}`);
78+
console.info(`\tSuccess:\t${browser.summary.passed}`);
79+
console.info(`\tSkipped:\t${browser.summary.skipped}`);
80+
console.info(`\tFailed:\t${browser.summary.failed}`);
81+
console.info(`\tTotal:\t${browser.summary.total}`);
7682
});
7783

7884
// render out html

‎karma.conf.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ module.exports = function init(config) {
1919
require('karma-junit-reporter'),
2020
require('./Utilities/Karma/tape-object-stream'),
2121
require('./Utilities/Karma/tape-html-reporter'),
22-
require('./Utilities/Karma/tap-object-html-reporter'),
2322
],
2423

2524
basePath: '',

0 commit comments

Comments
 (0)