Skip to content

fix: Incorrect precedence render collapsed #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
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
4 changes: 3 additions & 1 deletion src/pytest_html/basereport.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ def __init__(self, title, config):

collapsed = config.getini("render_collapsed")
if collapsed:
self.set_data("collapsed", collapsed.split(","))
self.set_data(
"collapsed", [outcome.lower() for outcome in collapsed.split(",")]
)

@property
def title(self):
Expand Down
8 changes: 4 additions & 4 deletions src/pytest_html/scripts/storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ const getCollapsedCategory = (config) => {
const url = new URL(window.location.href)
const collapsedItems = new URLSearchParams(url.search).get('collapsed')
switch (true) {
case collapsedItems === null:
categories = config || ['passed'];
case !config && collapsedItems === null:
categories = ['passed'];
break;
case collapsedItems?.length === 0 || /^["']{2}$/.test(collapsedItems):
categories = [];
break;
case /^all$/.test(collapsedItems):
case /^all$/.test(collapsedItems) || (collapsedItems === null && /^all$/.test(config)):
categories = [...possibleFilters];
break;
default:
categories = collapsedItems?.split(',').map(item => item.toLowerCase()) || [];
categories = collapsedItems?.split(',').map(item => item.toLowerCase()) || config;
break;
}
} else {
Expand Down
7 changes: 4 additions & 3 deletions testing/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -727,11 +727,12 @@ def test_falsy(self, pytester, test_file, param):
assert_that(is_collapsed(page, "test_fail")).is_false()
assert_that(is_collapsed(page, "test_error::setup")).is_false()

def test_render_collapsed(self, pytester, test_file):
@pytest.mark.parametrize("param", ["failed,error", "FAILED,eRRoR"])
def test_render_collapsed(self, pytester, test_file, param):
pytester.makeini(
"""
f"""
[pytest]
render_collapsed = failed,error
render_collapsed = {param}
"""
)
pytester.makepyfile(test_file)
Expand Down
29 changes: 21 additions & 8 deletions testing/unittest.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,29 @@ describe('Storage tests', () => {
expect(collapsedItems).to.eql(['failed', 'error', 'passed'])
})

it('handles python config', () => {
mockWindow()
const collapsedItems = storageModule.getCollapsedCategory(['failed', 'error'])
expect(collapsedItems).to.eql(['failed', 'error'])
const config = [
{ value: ['failed', 'error'], expected: ['failed', 'error'] },
{ value: ['all'], expected: storageModule.possibleFilters }
]
config.forEach(({value, expected}) => {
it(`handles python config: ${value}`, () => {
mockWindow()
const collapsedItems = storageModule.getCollapsedCategory(value)
expect(collapsedItems).to.eql(expected)
})
})

it('handles python config precedence', () => {
mockWindow('collapsed=xpassed,xfailed')
const collapsedItems = storageModule.getCollapsedCategory(['failed', 'error'])
expect(collapsedItems).to.eql(['xpassed', 'xfailed'])
const precedence = [
{query: 'collapsed=xpassed,xfailed', config: ['failed', 'error'], expected: ['xpassed', 'xfailed']},
{query: 'collapsed=all', config: ['failed', 'error'], expected: storageModule.possibleFilters},
{query: 'collapsed=xpassed,xfailed', config: ['all'], expected: ['xpassed', 'xfailed']},
]
precedence.forEach(({query, config, expected}, index) => {
it(`handles python config precedence ${index + 1}`, () => {
mockWindow(query)
const collapsedItems = storageModule.getCollapsedCategory(config)
expect(collapsedItems).to.eql(expected)
})
})

const falsy = [
Expand Down