diff --git a/src/pytest_html/report_data.py b/src/pytest_html/report_data.py index a9889c12..77fdb1b8 100644 --- a/src/pytest_html/report_data.py +++ b/src/pytest_html/report_data.py @@ -30,7 +30,7 @@ def __init__(self, config): DeprecationWarning, ) self.set_data( - "collapsed", [outcome.lower() for outcome in collapsed.split(",")] + "renderCollapsed", [outcome.lower() for outcome in collapsed.split(",")] ) @property diff --git a/src/pytest_html/scripts/datamanager.js b/src/pytest_html/scripts/datamanager.js index 25c2c3f8..9ebce446 100644 --- a/src/pytest_html/scripts/datamanager.js +++ b/src/pytest_html/scripts/datamanager.js @@ -2,7 +2,7 @@ const { getCollapsedCategory } = require('./storage.js') class DataManager { setManager(data) { - const collapsedCategories = [...getCollapsedCategory(data.collapsed)] + const collapsedCategories = [...getCollapsedCategory(data.renderCollapsed)] const dataBlob = { ...data, tests: Object.values(data.tests).flat().map((test, index) => ({ ...test, id: `test_${index}`, diff --git a/src/pytest_html/scripts/storage.js b/src/pytest_html/scripts/storage.js index 33ef3893..fd3cb4d1 100644 --- a/src/pytest_html/scripts/storage.js +++ b/src/pytest_html/scripts/storage.js @@ -58,23 +58,23 @@ const setSort = (type) => { history.pushState({}, null, unescape(url.href)) } -const getCollapsedCategory = (config) => { +const getCollapsedCategory = (renderCollapsed) => { let categories if (typeof window !== 'undefined') { const url = new URL(window.location.href) const collapsedItems = new URLSearchParams(url.search).get('collapsed') switch (true) { - case !config && collapsedItems === null: + case !renderCollapsed && collapsedItems === null: categories = ['passed'] break case collapsedItems?.length === 0 || /^["']{2}$/.test(collapsedItems): categories = [] break - case /^all$/.test(collapsedItems) || collapsedItems === null && /^all$/.test(config): + case /^all$/.test(collapsedItems) || collapsedItems === null && /^all$/.test(renderCollapsed): categories = [...possibleFilters] break default: - categories = collapsedItems?.split(',').map((item) => item.toLowerCase()) || config + categories = collapsedItems?.split(',').map((item) => item.toLowerCase()) || renderCollapsed break } } else {