From ce06de78a81b21b7085fcb3651754b2cf86792f7 Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Thu, 28 May 2020 16:52:43 -0500 Subject: [PATCH] tests misleadingly had a leading /, need to append it ourselves --- incorporealcms/pages.py | 4 ++-- tests/test_pages.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/incorporealcms/pages.py b/incorporealcms/pages.py index 198de15..ca4d45c 100644 --- a/incorporealcms/pages.py +++ b/incorporealcms/pages.py @@ -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}')] diff --git a/tests/test_pages.py b/tests/test_pages.py index 6da375b..8ab4158 100644 --- a/tests/test_pages.py +++ b/tests/test_pages.py @@ -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') + ]