bss
/
incorporeal-cms
1
0
Fork 0
Code Issues 2 Pull Requests Releases 45 Wiki Activity

tests misleadingly had a leading /, need to append it ourselves

This commit is contained in:
Brian S. Stephan 2020-05-28 16:52:43 -05:00
parent beea0c80bf
commit ce06de78a8
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
incorporealcms/pages.py
View File

@ -66,5 +66,5 @@ def generate_parent_navs(path):
with app.open_instance_resource(resolved_path, 'r') as entry_file:
entry = entry_file.read()
_ = Markup(md.convert(entry))
page_name = " ".join(md.Meta.get('title')) if md.Meta.get('title') else path
return generate_parent_navs(parent_path) + [(page_name, path)]
page_name = " ".join(md.Meta.get('title')) if md.Meta.get('title') else f'/{path}'
return generate_parent_navs(parent_path) + [(page_name, f'/{path}')]

14
tests/test_pages.py
View File

@ -58,17 +58,19 @@ def test_generate_page_navs_alternate_index(app):
def test_generate_page_navs_subdir_index(app):
with app.app_context():
assert generate_parent_navs('/subdir/') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/')]
assert generate_parent_navs('subdir/') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/')]
def test_generate_page_navs_subdir_real_page(app):
with app.app_context():
assert generate_parent_navs('/subdir/page') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/'),
('Page', '/subdir/page')]
assert generate_parent_navs('subdir/page') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/'),
('Page', '/subdir/page')]
def test_generate_page_navs_subdir_with_title_parsing_real_page(app):
with app.app_context():
assert generate_parent_navs('/subdir-with-title/page') == [('incorporeal.org', '/'),
('SUB!', '/subdir-with-title/'),
('/subdir-with-title/page', '/subdir-with-title/page')]
assert generate_parent_navs('subdir-with-title/page') == [
('incorporeal.org', '/'),
('SUB!', '/subdir-with-title/'),
('/subdir-with-title/page', '/subdir-with-title/page')
]