Skip to content

Commit 43175f1

Browse files
authored
Fix: Order and layout of outcome summary (#629)
1 parent 837872c commit 43175f1

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ test = [
5858
"pre-commit>=2.17.0",
5959
"pytest-xdist>=2.4.0",
6060
"pytest-mock>=3.7.0",
61+
"pytest-rerunfailures>=11.1.2",
6162
"selenium>=4.3.0",
6263
"tox>=3.24.5",
6364
]

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

+5
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@ const renderDerived = (tests, collectedItems, isFinished) => {
6565
possibleResults.forEach(({ result, label }) => {
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)

testing/test_integration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def assert_results(
8181
if isinstance(number, int):
8282
number_of_tests += number
8383
result = get_text(page, f"span[class={outcome}]")
84-
assert_that(result).is_equal_to(f"{number} {OUTCOMES[outcome]}")
84+
assert_that(result).matches(rf"{number} {OUTCOMES[outcome]}")
8585

8686

8787
def get_element(page, selector):

0 commit comments

Comments
 (0)