Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/layout/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,20 @@ div.media {
display: flex;
justify-content: space-between;
}
.filters {
.filters,
.collapse {
display: flex;
align-items: center;
button {
color: #999;
border: none;
background: none;
cursor: pointer;
text-decoration: underline;
&:hover {
color: #ccc;
}
}
}
.filter__label {
margin-right: 10px;
Expand Down
4 changes: 2 additions & 2 deletions src/pytest_html/resources/index.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
<input checked="true" class="filter" data-test-result="passed" name="filter_checkbox" type="checkbox"/><span class="passed"></span>
<input checked="true" class="filter" data-test-result="skipped" name="filter_checkbox" type="checkbox"/><span class="skipped"></span>
</div>
<div class="filters">
<a href="javascript:showAllExtras()">Show all details</a>&nbsp;/&nbsp;<a href="javascript:hideAllExtras()">Hide all details</a>
<div class="collapse">
<button id="show_all_details">Show all details</button>&nbsp;/&nbsp;<button id="hide_all_details">Hide all details</button>
Comment thread
drRedflint marked this conversation as resolved.
<div>
</div>
</div>
Expand Down
15 changes: 14 additions & 1 deletion src/pytest_html/resources/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion src/pytest_html/scripts/datamanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ class DataManager {
setRender(data) {
this.renderData.tests = data
}

set allCollapsed(collapsed) {
this.renderData = { ...this.data, tests: [...this.data.tests.map((test) => (
{ ...test, collapsed }
))] }
}

get testSubset() {
return [...this.renderData.tests]
}
Expand All @@ -31,7 +38,7 @@ class DataManager {
return this.renderData.durationFormat
}
get isFinished() {
return this.data.runningState === 'Finished'
return this.data.runningState === 'Finished'
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/pytest_html/scripts/dom.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,19 @@ const dom = {
return header
},
getListHeaderEmpty: () => listHeaderEmpty.content.cloneNode(true),
getResultTBody: ({ nodeid, longreprtext, duration, extras, resultsTableRow, tableHtml, outcome}) => {
getResultTBody: ({ nodeid, longreprtext, duration, extras, resultsTableRow, tableHtml, outcome, collapsed }) => {
const outcomeLower = outcome.toLowerCase()
const resultBody = templateResult.content.cloneNode(true)
resultBody.querySelector('tbody').classList.add(outcomeLower)
resultBody.querySelector('.col-result').innerText = outcome
resultBody.querySelector('.col-name').innerText = nodeid
resultBody.querySelector('.col-duration').innerText = `${formatDuration(duration)}s`


if (longreprtext) {
resultBody.querySelector('.log').innerText = longreprtext
} else {
}
if (collapsed || !longreprtext) {
resultBody.querySelector('.extras-row').classList.add('hidden')
}

Expand Down
45 changes: 26 additions & 19 deletions src/pytest_html/scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,25 @@ const removeChildren = (node) => {
}

const renderStatic = () => {
const title = manager.title
const environment = manager.environment
document.querySelector('#title').innerText = title
document.querySelector('#head-title').innerText = title
const rows = Object.keys(environment).map((key) =>
dom.getStaticRow(key, environment[key])
)

const table = document.querySelector('#environment')
removeChildren(table)
rows.forEach((row) => table.appendChild(row))
const renderTitle = () => {
const title = manager.title
document.querySelector('#title').innerText = title
document.querySelector('#head-title').innerText = title
}
const renderTable = () => {
const environment = manager.environment
const rows = Object.keys(environment).map((key) => dom.getStaticRow(key, environment[key]))
const table = document.querySelector('#environment')
removeChildren(table)
rows.forEach((row) => table.appendChild(row))
}
renderTitle()
renderTable()
}

const renderContent = (tests) => {
const renderSet = tests.filter(({ when, outcome }) => when === 'call' || outcome === 'Error' )

const rows = renderSet.map((test) =>
dom.getResultTBody(test)
)

const rows = renderSet.map(dom.getResultTBody)
const table = document.querySelector('#results-table')
removeChildren(table)
const tableHeader = dom.getListHeader(manager.renderData)
Expand Down Expand Up @@ -71,9 +70,9 @@ const renderDerived = (tests, collectedItems, isFinished) => {
input.checked = !currentFilter.includes(outcome)
})

const numberOfTests = renderSet.filter(({outcome}) =>
['Passed', 'Failed', 'XPassed', 'XFailed'].includes(outcome)
).length
const numberOfTests = renderSet.filter(({ outcome }) =>
['Passed', 'Failed', 'XPassed', 'XFailed'].includes(outcome)).length

if (isFinished) {
const accTime = tests.reduce((prev, { duration }) => prev + duration, 0)
const formattedAccTime = formatDuration(accTime)
Expand Down Expand Up @@ -105,6 +104,14 @@ const bindEvents = () => {
redraw()
})
})
document.querySelector('#show_all_details').addEventListener('click', () => {
manager.allCollapsed = false
redraw()
})
document.querySelector('#hide_all_details').addEventListener('click', () => {
manager.allCollapsed = true
redraw()
})
}

const renderPage = () => {
Expand Down