Skip to content

Commit 23b8f49

Browse files
committed
Fix: Order and layout of outcome summary
1 parent e4ad806 commit 23b8f49

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/pytest_html/resources/index.jinja2

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@
9797
<div class="summary__spacer"></div>
9898
<div class="controls">
9999
<div class="filters">
100-
<input checked="true" class="filter" data-test-result="error" name="filter_checkbox" type="checkbox"/><span class="error"></span>
101100
<input checked="true" class="filter" data-test-result="failed" name="filter_checkbox" type="checkbox"/><span class="failed"></span>
102-
<input checked="true" class="filter" data-test-result="rerun" name="filter_checkbox" type="checkbox"/><span class="rerun"></span>
103-
<input checked="true" class="filter" data-test-result="xfailed" name="filter_checkbox" type="checkbox"/><span class="xfailed"></span>
104-
<input checked="true" class="filter" data-test-result="xpassed" name="filter_checkbox" type="checkbox"/><span class="xpassed"></span>
105101
<input checked="true" class="filter" data-test-result="passed" name="filter_checkbox" type="checkbox"/><span class="passed"></span>
106102
<input checked="true" class="filter" data-test-result="skipped" name="filter_checkbox" type="checkbox"/><span class="skipped"></span>
103+
<input checked="true" class="filter" data-test-result="xfailed" name="filter_checkbox" type="checkbox"/><span class="xfailed"></span>
104+
<input checked="true" class="filter" data-test-result="xpassed" name="filter_checkbox" type="checkbox"/><span class="xpassed"></span>
105+
<input checked="true" class="filter" data-test-result="error" name="filter_checkbox" type="checkbox"/><span class="error"></span>
106+
<input checked="true" class="filter" data-test-result="rerun" name="filter_checkbox" type="checkbox"/><span class="rerun"></span>
107107
</div>
108108
<div class="collapse">
109109
<button id="show_all_details">Show all details</button>&nbsp;/&nbsp;<button id="hide_all_details">Hide all details</button>

src/pytest_html/scripts/main.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,15 @@ const renderContent = (tests) => {
6262

6363
const renderDerived = (tests, collectedItems, isFinished) => {
6464
const currentFilter = getVisible()
65-
possibleResults.forEach(({ result, label }) => {
65+
possibleResults.forEach(({ result, label }, index) => {
6666
const count = tests.filter((test) => test.result.toLowerCase() === result).length
6767
const input = document.querySelector(`input[data-test-result="${result}"]`)
68+
const lastInput = document.querySelector(`input[data-test-result="${result}"]:last-of-type`)
6869
document.querySelector(`.${result}`).innerText = `${count} ${label}`
70+
// add a comma and whitespace between the results
71+
if (input !== lastInput) {
72+
document.querySelector(`.${result}`).innerText += ', '
73+
}
6974

7075
input.disabled = !count
7176
input.checked = currentFilter.includes(result)

0 commit comments

Comments
 (0)