Skip to content

Commit 60c81d8

Browse files
authored
Chore: Disambiguate collapsed (#657)
1 parent df6f4d8 commit 60c81d8

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/pytest_html/report_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self, config):
3030
DeprecationWarning,
3131
)
3232
self.set_data(
33-
"collapsed", [outcome.lower() for outcome in collapsed.split(",")]
33+
"renderCollapsed", [outcome.lower() for outcome in collapsed.split(",")]
3434
)
3535

3636
@property

src/pytest_html/scripts/datamanager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const { getCollapsedCategory } = require('./storage.js')
22

33
class DataManager {
44
setManager(data) {
5-
const collapsedCategories = [...getCollapsedCategory(data.collapsed)]
5+
const collapsedCategories = [...getCollapsedCategory(data.renderCollapsed)]
66
const dataBlob = { ...data, tests: Object.values(data.tests).flat().map((test, index) => ({
77
...test,
88
id: `test_${index}`,

src/pytest_html/scripts/storage.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,23 @@ const setSort = (type) => {
5858
history.pushState({}, null, unescape(url.href))
5959
}
6060

61-
const getCollapsedCategory = (config) => {
61+
const getCollapsedCategory = (renderCollapsed) => {
6262
let categories
6363
if (typeof window !== 'undefined') {
6464
const url = new URL(window.location.href)
6565
const collapsedItems = new URLSearchParams(url.search).get('collapsed')
6666
switch (true) {
67-
case !config && collapsedItems === null:
67+
case !renderCollapsed && collapsedItems === null:
6868
categories = ['passed']
6969
break
7070
case collapsedItems?.length === 0 || /^["']{2}$/.test(collapsedItems):
7171
categories = []
7272
break
73-
case /^all$/.test(collapsedItems) || collapsedItems === null && /^all$/.test(config):
73+
case /^all$/.test(collapsedItems) || collapsedItems === null && /^all$/.test(renderCollapsed):
7474
categories = [...possibleFilters]
7575
break
7676
default:
77-
categories = collapsedItems?.split(',').map((item) => item.toLowerCase()) || config
77+
categories = collapsedItems?.split(',').map((item) => item.toLowerCase()) || renderCollapsed
7878
break
7979
}
8080
} else {

0 commit comments

Comments
 (0)