A Pelican Blog

From: Vladimír Vondruš Date: Sat, 16 Dec 2017 17:52:30 +0000 (+0100) Subject: theme: reduce random noise in test files. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=99b24c41b87f54b0720c7382ad15e6a4213aae98;p=blog.git theme: reduce random noise in test files. --- diff --git a/pelican-theme/test/__init__.py b/pelican-theme/test/__init__.py index 812fd462..b6e1b189 100644 --- a/pelican-theme/test/__init__.py +++ b/pelican-theme/test/__init__.py @@ -75,7 +75,7 @@ class BaseTestCase(MinimalTestCase): 'PLUGIN_PATHS': ['../pelican-plugins'], 'PLUGINS': ['m.htmlsanity'], 'THEME_STATIC_DIR': 'static', - 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i', + 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i', 'static/m-dark.css'], # i.e., not rendering the category, tag and author lists as they # are not supported anyway @@ -89,6 +89,7 @@ class PageTestCase(BaseTestCase): def run_pelican(self, settings): implicit_settings = { 'M_FINE_PRINT': None, + 'M_DISABLE_SOCIAL_META_TAGS': True, 'PAGE_PATHS': ['.'], 'PAGE_SAVE_AS': '{slug}.html', 'PAGE_URL': '{slug}.html', @@ -103,6 +104,7 @@ class BlogTestCase(BaseTestCase): implicit_settings = { 'DATE_FORMATS': {'en': ('en_US.UTF-8', '%b %d, %Y')}, 'M_FINE_PRINT': None, + 'M_DISABLE_SOCIAL_META_TAGS': True, 'PAGE_PATHS': ['pages'], # doesn't exist 'ARTICLE_PATHS': ['.'], 'AUTHOR_SAVE_AS': 'author-{slug}.html', diff --git a/pelican-theme/test/blog/archives.html b/pelican-theme/test/blog/archives.html index b98e809e..d0854490 100644 --- a/pelican-theme/test/blog/archives.html +++ b/pelican-theme/test/blog/archives.html @@ -3,7 +3,7 @@ A Pelican Blog - + diff --git a/pelican-theme/test/blog/article-jumbo.html b/pelican-theme/test/blog/article-jumbo.html index e392bdde..9cf46ccc 100644 --- a/pelican-theme/test/blog/article-jumbo.html +++ b/pelican-theme/test/blog/article-jumbo.html @@ -3,7 +3,7 @@ An article â a jumbo one | A Pelican Blog - + diff --git a/pelican-theme/test/blog/article.html b/pelican-theme/test/blog/article.html index cb789539..05fdad7c 100644 --- a/pelican-theme/test/blog/article.html +++ b/pelican-theme/test/blog/article.html @@ -3,7 +3,7 @@ An article | A Pelican Blog - + diff --git a/pelican-theme/test/blog/author-explicit-author.html b/pelican-theme/test/blog/author-explicit-author.html index 86e885e3..cf4eade7 100644 --- a/pelican-theme/test/blog/author-explicit-author.html +++ b/pelican-theme/test/blog/author-explicit-author.html @@ -3,7 +3,7 @@ Posts by Explicit Author | A Pelican Blog - + diff --git a/pelican-theme/test/blog/category-another-category.html b/pelican-theme/test/blog/category-another-category.html index 6871aa14..4f1b0ec6 100644 --- a/pelican-theme/test/blog/category-another-category.html +++ b/pelican-theme/test/blog/category-another-category.html @@ -3,7 +3,7 @@ Another category | A Pelican Blog - + diff --git a/pelican-theme/test/blog/index.html b/pelican-theme/test/blog/index.html index 39e32393..b804f4c8 100644 --- a/pelican-theme/test/blog/index.html +++ b/pelican-theme/test/blog/index.html @@ -3,7 +3,7 @@ A Pelican Blog - + diff --git a/pelican-theme/test/blog/tag-third.html b/pelican-theme/test/blog/tag-third.html index 83ef88ee..9bc9d909 100644 --- a/pelican-theme/test/blog/tag-third.html +++ b/pelican-theme/test/blog/tag-third.html @@ -3,7 +3,7 @@ Posts tagged Third | A Pelican Blog - + diff --git a/pelican-theme/test/blog_author_list/article-jumbo.html b/pelican-theme/test/blog_author_list/article-jumbo.html index e3952fd0..ab955df8 100644 --- a/pelican-theme/test/blog_author_list/article-jumbo.html +++ b/pelican-theme/test/blog_author_list/article-jumbo.html @@ -1,20 +1,12 @@ - + A jumbo article | A Pelican Blog - + - - - - - - - -

diff --git a/pelican-theme/test/blog_author_list/index.html b/pelican-theme/test/blog_author_list/index.html index e2dcecf7..78bf321b 100644 --- a/pelican-theme/test/blog_author_list/index.html +++ b/pelican-theme/test/blog_author_list/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_both/index.html b/pelican-theme/test/blog_collapse_first_both/index.html index d005ea13..109e02eb 100644 --- a/pelican-theme/test/blog_collapse_first_both/index.html +++ b/pelican-theme/test/blog_collapse_first_both/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html index c5a00722..14d1bf86 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article-jumbo.html @@ -1,22 +1,12 @@ - + A jumbo article | A Pelican Blog - + - - - - - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html index 4606452f..f9456297 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/article.html @@ -1,20 +1,12 @@ - + An article | A Pelican Blog - + - - - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/index.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/index.html index 93d015e7..1c21b186 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_both/index.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_both/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html index 9bc43a87..66303986 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article-jumbo.html @@ -1,22 +1,12 @@ - + A jumbo article | A Pelican Blog - + - - - - - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html index da134ebc..7793f81b 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/article.html @@ -1,20 +1,12 @@ - + An article | A Pelican Blog - + - - - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/index.html b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/index.html index 1a4375cb..b0bb03b4 100644 --- a/pelican-theme/test/blog_collapse_first_both_hide_summary_global/index.html +++ b/pelican-theme/test/blog_collapse_first_both_hide_summary_global/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_global/index.html b/pelican-theme/test/blog_collapse_first_global/index.html index a0ac0d75..2b44faa5 100644 --- a/pelican-theme/test/blog_collapse_first_global/index.html +++ b/pelican-theme/test/blog_collapse_first_global/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html index 6d204479..18357765 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article-jumbo.html @@ -1,22 +1,12 @@ - + A jumbo article | A Pelican Blog - + - - - - - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html index a291a70b..d5a76e7c 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/article.html @@ -1,20 +1,12 @@ - + An article | A Pelican Blog - + - - - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/index.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/index.html index 580ea5d9..a4369d78 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_both/index.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_both/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html index 9bc43a87..66303986 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article-jumbo.html @@ -1,22 +1,12 @@ - + A jumbo article | A Pelican Blog - + - - - - - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html index 0b815326..33974c72 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/article.html @@ -1,20 +1,12 @@ - + An article | A Pelican Blog - + - - - - - - - -

diff --git a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/index.html b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/index.html index cc38c6bc..e60a45e3 100644 --- a/pelican-theme/test/blog_collapse_first_global_hide_summary_global/index.html +++ b/pelican-theme/test/blog_collapse_first_global_hide_summary_global/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_footer_links/index.html b/pelican-theme/test/blog_footer_links/index.html index 3111b5cd..1e5d094a 100644 --- a/pelican-theme/test/blog_footer_links/index.html +++ b/pelican-theme/test/blog_footer_links/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_global_social_meta/article.html b/pelican-theme/test/blog_global_social_meta/article.html index ffaad899..c1d4e4d5 100644 --- a/pelican-theme/test/blog_global_social_meta/article.html +++ b/pelican-theme/test/blog_global_social_meta/article.html @@ -3,7 +3,7 @@ An article | A Pelican Blog - + diff --git a/pelican-theme/test/blog_global_social_meta/author-the-author.html b/pelican-theme/test/blog_global_social_meta/author-the-author.html index 093066ac..0bfc2b40 100644 --- a/pelican-theme/test/blog_global_social_meta/author-the-author.html +++ b/pelican-theme/test/blog_global_social_meta/author-the-author.html @@ -3,7 +3,7 @@ Posts by The Author | A Pelican Blog - + diff --git a/pelican-theme/test/blog_global_social_meta/category-a-category.html b/pelican-theme/test/blog_global_social_meta/category-a-category.html index d63db063..79be0a65 100644 --- a/pelican-theme/test/blog_global_social_meta/category-a-category.html +++ b/pelican-theme/test/blog_global_social_meta/category-a-category.html @@ -3,7 +3,7 @@ A category | A Pelican Blog - + diff --git a/pelican-theme/test/blog_global_social_meta/tag-a-tag.html b/pelican-theme/test/blog_global_social_meta/tag-a-tag.html index 332a5943..e3764355 100644 --- a/pelican-theme/test/blog_global_social_meta/tag-a-tag.html +++ b/pelican-theme/test/blog_global_social_meta/tag-a-tag.html @@ -3,7 +3,7 @@ Posts tagged A tag | A Pelican Blog - + diff --git a/pelican-theme/test/blog_hide_summary_both/article-jumbo.html b/pelican-theme/test/blog_hide_summary_both/article-jumbo.html index 4c115e98..d58eae0b 100644 --- a/pelican-theme/test/blog_hide_summary_both/article-jumbo.html +++ b/pelican-theme/test/blog_hide_summary_both/article-jumbo.html @@ -1,22 +1,12 @@ - + A jumbo article | A Pelican Blog - + - - - - - - - - - -

diff --git a/pelican-theme/test/blog_hide_summary_both/article.html b/pelican-theme/test/blog_hide_summary_both/article.html index ff2f2d26..a648d2c1 100644 --- a/pelican-theme/test/blog_hide_summary_both/article.html +++ b/pelican-theme/test/blog_hide_summary_both/article.html @@ -1,20 +1,12 @@ - + An article | A Pelican Blog - + - - - - - - - -

diff --git a/pelican-theme/test/blog_hide_summary_both/category-misc.html b/pelican-theme/test/blog_hide_summary_both/category-misc.html index 754364df..31f2b9e8 100644 --- a/pelican-theme/test/blog_hide_summary_both/category-misc.html +++ b/pelican-theme/test/blog_hide_summary_both/category-misc.html @@ -1,17 +1,11 @@ - + misc | A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_hide_summary_both/index.html b/pelican-theme/test/blog_hide_summary_both/index.html index ad6d781b..bfbb5f43 100644 --- a/pelican-theme/test/blog_hide_summary_both/index.html +++ b/pelican-theme/test/blog_hide_summary_both/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_hide_summary_global/article-jumbo.html b/pelican-theme/test/blog_hide_summary_global/article-jumbo.html index 403c4343..cab8efc3 100644 --- a/pelican-theme/test/blog_hide_summary_global/article-jumbo.html +++ b/pelican-theme/test/blog_hide_summary_global/article-jumbo.html @@ -1,22 +1,12 @@ - + A jumbo article | A Pelican Blog - + - - - - - - - - - -

diff --git a/pelican-theme/test/blog_hide_summary_global/article.html b/pelican-theme/test/blog_hide_summary_global/article.html index 77ef7640..b95c5072 100644 --- a/pelican-theme/test/blog_hide_summary_global/article.html +++ b/pelican-theme/test/blog_hide_summary_global/article.html @@ -1,20 +1,12 @@ - + An article | A Pelican Blog - + - - - - - - - -

diff --git a/pelican-theme/test/blog_hide_summary_global/category-misc.html b/pelican-theme/test/blog_hide_summary_global/category-misc.html index 8eabf515..8b503ae5 100644 --- a/pelican-theme/test/blog_hide_summary_global/category-misc.html +++ b/pelican-theme/test/blog_hide_summary_global/category-misc.html @@ -1,17 +1,11 @@ - + misc | A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_hide_summary_global/index.html b/pelican-theme/test/blog_hide_summary_global/index.html index 5753759b..385fe85a 100644 --- a/pelican-theme/test/blog_hide_summary_global/index.html +++ b/pelican-theme/test/blog_hide_summary_global/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_html_escape/archives.html b/pelican-theme/test/blog_html_escape/archives.html index 69fad2a3..1b2a5b10 100644 --- a/pelican-theme/test/blog_html_escape/archives.html +++ b/pelican-theme/test/blog_html_escape/archives.html @@ -3,7 +3,7 @@ <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/archives2.html b/pelican-theme/test/blog_html_escape/archives2.html index dd653495..77ceb109 100644 --- a/pelican-theme/test/blog_html_escape/archives2.html +++ b/pelican-theme/test/blog_html_escape/archives2.html @@ -3,7 +3,7 @@ <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/article-jumbo.html b/pelican-theme/test/blog_html_escape/article-jumbo.html index bf2eff6e..eae60fc6 100644 --- a/pelican-theme/test/blog_html_escape/article-jumbo.html +++ b/pelican-theme/test/blog_html_escape/article-jumbo.html @@ -3,7 +3,7 @@ Article with <&> â a <&> jumbo one | <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/article.html b/pelican-theme/test/blog_html_escape/article.html index 1b5ec680..27b0ad9b 100644 --- a/pelican-theme/test/blog_html_escape/article.html +++ b/pelican-theme/test/blog_html_escape/article.html @@ -3,7 +3,7 @@ Article with <&> in title | <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/author-and-in-author.html b/pelican-theme/test/blog_html_escape/author-and-in-author.html index 92b63a86..17ae8145 100644 --- a/pelican-theme/test/blog_html_escape/author-and-in-author.html +++ b/pelican-theme/test/blog_html_escape/author-and-in-author.html @@ -3,7 +3,7 @@ Posts by And <&> in author | <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/author-and-in-author2.html b/pelican-theme/test/blog_html_escape/author-and-in-author2.html index cd1db112..d16ba4ba 100644 --- a/pelican-theme/test/blog_html_escape/author-and-in-author2.html +++ b/pelican-theme/test/blog_html_escape/author-and-in-author2.html @@ -3,7 +3,7 @@ Posts by And <&> in author | <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/category-and-in-category.html b/pelican-theme/test/blog_html_escape/category-and-in-category.html index 8d022afd..47cbaa92 100644 --- a/pelican-theme/test/blog_html_escape/category-and-in-category.html +++ b/pelican-theme/test/blog_html_escape/category-and-in-category.html @@ -3,7 +3,7 @@ And <&> in category | <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/category-and-in-category2.html b/pelican-theme/test/blog_html_escape/category-and-in-category2.html index 3f7be8cb..ca83e2e9 100644 --- a/pelican-theme/test/blog_html_escape/category-and-in-category2.html +++ b/pelican-theme/test/blog_html_escape/category-and-in-category2.html @@ -3,7 +3,7 @@ And <&> in category | <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/index.html b/pelican-theme/test/blog_html_escape/index.html index deee85d1..aee21227 100644 --- a/pelican-theme/test/blog_html_escape/index.html +++ b/pelican-theme/test/blog_html_escape/index.html @@ -3,7 +3,7 @@ <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/index2.html b/pelican-theme/test/blog_html_escape/index2.html index 1b357750..4e96afbe 100644 --- a/pelican-theme/test/blog_html_escape/index2.html +++ b/pelican-theme/test/blog_html_escape/index2.html @@ -3,7 +3,7 @@ <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/tag-and-in-tag.html b/pelican-theme/test/blog_html_escape/tag-and-in-tag.html index 5630cd53..cbc21ee9 100644 --- a/pelican-theme/test/blog_html_escape/tag-and-in-tag.html +++ b/pelican-theme/test/blog_html_escape/tag-and-in-tag.html @@ -3,7 +3,7 @@ Posts tagged And <&> in tag | <&> in blog name - + diff --git a/pelican-theme/test/blog_html_escape/tag-and-in-tag2.html b/pelican-theme/test/blog_html_escape/tag-and-in-tag2.html index f751e969..d5e501df 100644 --- a/pelican-theme/test/blog_html_escape/tag-and-in-tag2.html +++ b/pelican-theme/test/blog_html_escape/tag-and-in-tag2.html @@ -3,7 +3,7 @@ Posts tagged And <&> in tag | <&> in blog name - + diff --git a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html index 3aeddd39..da40587e 100644 --- a/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html +++ b/pelican-theme/test/blog_jumbo_inverted/article-jumbo.html @@ -1,20 +1,12 @@ - + A jumbo article | A Pelican Blog - + - - - - - - - -

diff --git a/pelican-theme/test/blog_minimal/article-jumbo.html b/pelican-theme/test/blog_minimal/article-jumbo.html index c2e4f60c..1e648198 100644 --- a/pelican-theme/test/blog_minimal/article-jumbo.html +++ b/pelican-theme/test/blog_minimal/article-jumbo.html @@ -3,7 +3,7 @@ A jumbo article | A Pelican Blog - + diff --git a/pelican-theme/test/blog_minimal/article.html b/pelican-theme/test/blog_minimal/article.html index cbc27185..c807df02 100644 --- a/pelican-theme/test/blog_minimal/article.html +++ b/pelican-theme/test/blog_minimal/article.html @@ -3,7 +3,7 @@ An article | A Pelican Blog - + diff --git a/pelican-theme/test/blog_minimal/category-misc.html b/pelican-theme/test/blog_minimal/category-misc.html index 4140132f..4b337f6b 100644 --- a/pelican-theme/test/blog_minimal/category-misc.html +++ b/pelican-theme/test/blog_minimal/category-misc.html @@ -3,7 +3,7 @@ misc | A Pelican Blog - + diff --git a/pelican-theme/test/blog_minimal/index.html b/pelican-theme/test/blog_minimal/index.html index 7a0cd47f..fc8021e0 100644 --- a/pelican-theme/test/blog_minimal/index.html +++ b/pelican-theme/test/blog_minimal/index.html @@ -3,7 +3,7 @@ A Pelican Blog - + diff --git a/pelican-theme/test/blog_modified_date/index.html b/pelican-theme/test/blog_modified_date/index.html index a271f66f..c9cf3c03 100644 --- a/pelican-theme/test/blog_modified_date/index.html +++ b/pelican-theme/test/blog_modified_date/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/blog_pagination/category-misc.html b/pelican-theme/test/blog_pagination/category-misc.html index 3a93faa8..00da5196 100644 --- a/pelican-theme/test/blog_pagination/category-misc.html +++ b/pelican-theme/test/blog_pagination/category-misc.html @@ -3,7 +3,7 @@ misc | A Pelican Blog - + diff --git a/pelican-theme/test/blog_pagination/category-misc2.html b/pelican-theme/test/blog_pagination/category-misc2.html index 64cdc887..3107238b 100644 --- a/pelican-theme/test/blog_pagination/category-misc2.html +++ b/pelican-theme/test/blog_pagination/category-misc2.html @@ -3,7 +3,7 @@ misc | A Pelican Blog - + diff --git a/pelican-theme/test/blog_pagination/category-misc3.html b/pelican-theme/test/blog_pagination/category-misc3.html index 2eb9d8c0..c9cfad96 100644 --- a/pelican-theme/test/blog_pagination/category-misc3.html +++ b/pelican-theme/test/blog_pagination/category-misc3.html @@ -3,7 +3,7 @@ misc | A Pelican Blog - + diff --git a/pelican-theme/test/blog_pagination/index.html b/pelican-theme/test/blog_pagination/index.html index 8db4e79b..28213ad4 100644 --- a/pelican-theme/test/blog_pagination/index.html +++ b/pelican-theme/test/blog_pagination/index.html @@ -3,7 +3,7 @@ A Pelican Blog - + diff --git a/pelican-theme/test/blog_pagination/index2.html b/pelican-theme/test/blog_pagination/index2.html index 1e790f82..bed5c02e 100644 --- a/pelican-theme/test/blog_pagination/index2.html +++ b/pelican-theme/test/blog_pagination/index2.html @@ -3,7 +3,7 @@ A Pelican Blog - + diff --git a/pelican-theme/test/blog_pagination/index3.html b/pelican-theme/test/blog_pagination/index3.html index 0aad9257..c993d6a5 100644 --- a/pelican-theme/test/blog_pagination/index3.html +++ b/pelican-theme/test/blog_pagination/index3.html @@ -3,7 +3,7 @@ A Pelican Blog - + diff --git a/pelican-theme/test/blog_pagination_disabled/index.html b/pelican-theme/test/blog_pagination_disabled/index.html index 9a80bd31..6770fbb4 100644 --- a/pelican-theme/test/blog_pagination_disabled/index.html +++ b/pelican-theme/test/blog_pagination_disabled/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/layout/features.html b/pelican-theme/test/layout/features.html index 2fdee422..59d39022 100644 --- a/pelican-theme/test/layout/features.html +++ b/pelican-theme/test/layout/features.html @@ -3,7 +3,7 @@ Features | Your Brand - + diff --git a/pelican-theme/test/layout/guest-post-howto.html b/pelican-theme/test/layout/guest-post-howto.html index 99a5312a..9e44328e 100644 --- a/pelican-theme/test/layout/guest-post-howto.html +++ b/pelican-theme/test/layout/guest-post-howto.html @@ -3,7 +3,7 @@ Guest post howto | Your Brand - + diff --git a/pelican-theme/test/layout/index.html b/pelican-theme/test/layout/index.html index f1b4fa0a..009bf9e7 100644 --- a/pelican-theme/test/layout/index.html +++ b/pelican-theme/test/layout/index.html @@ -3,7 +3,7 @@ Your Brand Blog - + diff --git a/pelican-theme/test/layout/showcase-requirements.html b/pelican-theme/test/layout/showcase-requirements.html index 86b684d9..f4f2de6e 100644 --- a/pelican-theme/test/layout/showcase-requirements.html +++ b/pelican-theme/test/layout/showcase-requirements.html @@ -3,7 +3,7 @@ Showcase requirements | Your Brand - + diff --git a/pelican-theme/test/layout_disable_blog_links/index.html b/pelican-theme/test/layout_disable_blog_links/index.html index 707e4a37..a0c3c646 100644 --- a/pelican-theme/test/layout_disable_blog_links/index.html +++ b/pelican-theme/test/layout_disable_blog_links/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/layout_disable_fine_print/index.html b/pelican-theme/test/layout_disable_fine_print/index.html index 37f36c8e..c6787795 100644 --- a/pelican-theme/test/layout_disable_fine_print/index.html +++ b/pelican-theme/test/layout_disable_fine_print/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/layout_global_social_meta/archives.html b/pelican-theme/test/layout_global_social_meta/archives.html index 0b57a3a9..c2ed7db7 100644 --- a/pelican-theme/test/layout_global_social_meta/archives.html +++ b/pelican-theme/test/layout_global_social_meta/archives.html @@ -3,7 +3,7 @@ Your Brand Blog - + diff --git a/pelican-theme/test/layout_global_social_meta/index.html b/pelican-theme/test/layout_global_social_meta/index.html index ec23f20f..2d4ae2b4 100644 --- a/pelican-theme/test/layout_global_social_meta/index.html +++ b/pelican-theme/test/layout_global_social_meta/index.html @@ -3,7 +3,7 @@ Your Brand Blog - + diff --git a/pelican-theme/test/layout_html_escape/index.html b/pelican-theme/test/layout_html_escape/index.html index c274aede..13246ef3 100644 --- a/pelican-theme/test/layout_html_escape/index.html +++ b/pelican-theme/test/layout_html_escape/index.html @@ -3,7 +3,7 @@ A <&> blog - + diff --git a/pelican-theme/test/layout_minimal/index.html b/pelican-theme/test/layout_minimal/index.html index 20e852c3..ce3c41fa 100644 --- a/pelican-theme/test/layout_minimal/index.html +++ b/pelican-theme/test/layout_minimal/index.html @@ -3,7 +3,7 @@ A Pelican Blog - + diff --git a/pelican-theme/test/layout_no_footer/index.html b/pelican-theme/test/layout_no_footer/index.html index 0eacc7ee..41fb00e2 100644 --- a/pelican-theme/test/layout_no_footer/index.html +++ b/pelican-theme/test/layout_no_footer/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/layout_one_column_navbar/index.html b/pelican-theme/test/layout_one_column_navbar/index.html index ba89d73f..8b907eef 100644 --- a/pelican-theme/test/layout_one_column_navbar/index.html +++ b/pelican-theme/test/layout_one_column_navbar/index.html @@ -1,17 +1,11 @@ - + A Pelican Blog - + - - - - - -

@@ -50,14 +44,5 @@ - diff --git a/pelican-theme/test/page/page.html b/pelican-theme/test/page/page.html index 6cfcd871..b3ecc272 100644 --- a/pelican-theme/test/page/page.html +++ b/pelican-theme/test/page/page.html @@ -3,7 +3,7 @@ A page | A Pelican Blog - + diff --git a/pelican-theme/test/page_breadcrumb/page.html b/pelican-theme/test/page_breadcrumb/page.html index 25da2b38..4c076fec 100644 --- a/pelican-theme/test/page_breadcrumb/page.html +++ b/pelican-theme/test/page_breadcrumb/page.html @@ -3,7 +3,7 @@ Index page » A page | A Pelican Blog - + diff --git a/pelican-theme/test/page_breadcrumb/subpage.html b/pelican-theme/test/page_breadcrumb/subpage.html index 1fcaab38..f3da2995 100644 --- a/pelican-theme/test/page_breadcrumb/subpage.html +++ b/pelican-theme/test/page_breadcrumb/subpage.html @@ -3,7 +3,7 @@ Index page » A page » Subpage | A Pelican Blog - + diff --git a/pelican-theme/test/page_extra_css/page.html b/pelican-theme/test/page_extra_css/page.html index ed00734e..897030fa 100644 --- a/pelican-theme/test/page_extra_css/page.html +++ b/pelican-theme/test/page_extra_css/page.html @@ -1,20 +1,14 @@ - + A page | A Pelican Blog - + - - - - - -

diff --git a/pelican-theme/test/page_global_social_meta/page.html b/pelican-theme/test/page_global_social_meta/page.html index 5607fa54..99c9bd70 100644 --- a/pelican-theme/test/page_global_social_meta/page.html +++ b/pelican-theme/test/page_global_social_meta/page.html @@ -3,7 +3,7 @@ A page | A Pelican Blog - + diff --git a/pelican-theme/test/page_header_footer/page.html b/pelican-theme/test/page_header_footer/page.html index 7b24f705..79407a79 100644 --- a/pelican-theme/test/page_header_footer/page.html +++ b/pelican-theme/test/page_header_footer/page.html @@ -1,20 +1,12 @@ - + A page | A Pelican Blog - + - - - - - - - -

diff --git a/pelican-theme/test/page_html_escape/breadcrumb.html b/pelican-theme/test/page_html_escape/breadcrumb.html index 9b0ad9d6..32fe8fc5 100644 --- a/pelican-theme/test/page_html_escape/breadcrumb.html +++ b/pelican-theme/test/page_html_escape/breadcrumb.html @@ -3,7 +3,7 @@ And <&> in breadcrumb » Page with <&> in title | <&> in site name - + diff --git a/pelican-theme/test/page_html_escape/content.html b/pelican-theme/test/page_html_escape/content.html index 7d1b1fa5..56be1101 100644 --- a/pelican-theme/test/page_html_escape/content.html +++ b/pelican-theme/test/page_html_escape/content.html @@ -3,7 +3,7 @@ Escaping in content | <&> in site name - + diff --git a/pelican-theme/test/page_html_escape/landing.html b/pelican-theme/test/page_html_escape/landing.html index 550a0821..de2e3849 100644 --- a/pelican-theme/test/page_html_escape/landing.html +++ b/pelican-theme/test/page_html_escape/landing.html @@ -3,7 +3,7 @@ <&> in site name - + diff --git a/pelican-theme/test/page_html_escape/page.html b/pelican-theme/test/page_html_escape/page.html index 6fa1d973..aec72cc5 100644 --- a/pelican-theme/test/page_html_escape/page.html +++ b/pelican-theme/test/page_html_escape/page.html @@ -3,7 +3,7 @@ Page with <&> in title | <&> in site name - + diff --git a/pelican-theme/test/page_landing/hide-navbar-brand.html b/pelican-theme/test/page_landing/hide-navbar-brand.html index 95eab1d8..049d3065 100644 --- a/pelican-theme/test/page_landing/hide-navbar-brand.html +++ b/pelican-theme/test/page_landing/hide-navbar-brand.html @@ -3,7 +3,7 @@ A page | A Pelican Blog - + diff --git a/pelican-theme/test/page_landing/page.html b/pelican-theme/test/page_landing/page.html index 5ce4c923..0932a266 100644 --- a/pelican-theme/test/page_landing/page.html +++ b/pelican-theme/test/page_landing/page.html @@ -3,7 +3,7 @@ A page title that displays only in title | A Pelican Blog - + diff --git a/pelican-theme/test/page_minimal/page.html b/pelican-theme/test/page_minimal/page.html index fc5d9416..fdd6c7bf 100644 --- a/pelican-theme/test/page_minimal/page.html +++ b/pelican-theme/test/page_minimal/page.html @@ -3,7 +3,7 @@ A page | A Pelican Blog - + diff --git a/pelican-theme/test/page_title_sitename_alias/page.html b/pelican-theme/test/page_title_sitename_alias/page.html index f5fa927f..166a3042 100644 --- a/pelican-theme/test/page_title_sitename_alias/page.html +++ b/pelican-theme/test/page_title_sitename_alias/page.html @@ -1,18 +1,12 @@ - + Site name - + - - - - - -

diff --git a/pelican-theme/test/test_blog.py b/pelican-theme/test/test_blog.py index 2f01cc25..1e1559d0 100644 --- a/pelican-theme/test/test_blog.py +++ b/pelican-theme/test/test_blog.py @@ -30,6 +30,7 @@ class Blog(BlogTestCase): def test(self): self.run_pelican({ + 'M_DISABLE_SOCIAL_META_TAGS': False, 'AUTHOR': "Implicit Author", 'STATIC_PATHS': ['ship.jpg'], 'M_BLOG_URL': 'archives.html', @@ -55,7 +56,10 @@ class Minimal(BlogTestCase): super().__init__(__file__, 'minimal', *args, **kwargs) def test(self): - self.run_pelican({}) + self.run_pelican({ + # There shouldn't be empty meta tags + 'M_DISABLE_SOCIAL_META_TAGS': False, + }) # The summary, content blocks should not be there at all, no mention of # authors. Index and archive page should be exactly the same. Header @@ -124,7 +128,10 @@ class Pagination(BlogTestCase): [(1, 'index.html', '{name}.html'), (2, 'index{number}.html', '{name}{number}.html')], 'DIRECT_TEMPLATES': ['index', 'archives'], - 'PAGINATED_DIRECT_TEMPLATES': ['index', 'archives'] + 'PAGINATED_DIRECT_TEMPLATES': ['index', 'archives'], + + # verify that og:url doesn't take pagination into account + 'M_DISABLE_SOCIAL_META_TAGS': False }) # Every page should contain just one article, only the first page @@ -142,7 +149,10 @@ class Pagination(BlogTestCase): def test_categories(self): self.run_pelican({ 'DEFAULT_PAGINATION': 1, - 'DIRECT_TEMPLATES': [] + 'DIRECT_TEMPLATES': [], + + # verify that og:url doesn't take pagination into account + 'M_DISABLE_SOCIAL_META_TAGS': False }) # Test the category pages as well (same as author/tag). Couldn't test @@ -443,6 +453,7 @@ class HtmlEscape(BlogTestCase): 'TAG_URL': 'tag-{slug}.html?and&in&url=""', 'M_LINKS_FOOTER2': [('An <&> in link', '#')], 'M_SHOW_AUTHOR_LIST': True, + 'M_DISABLE_SOCIAL_META_TAGS': False, # to verify escaping in these 'DEFAULT_PAGINATION': 1, 'PAGINATION_PATTERNS': [(1, 'index.html?and&in&url=""', '{name}.html'), @@ -474,7 +485,8 @@ class GlobalSocialMeta(BlogTestCase): 'M_SOCIAL_TWITTER_SITE': '@czmosra', 'M_SOCIAL_TWITTER_SITE_ID': '1537427036', 'M_SOCIAL_IMAGE': 'http://your.brand/static/site.png', - 'M_SOCIAL_BLOG_SUMMARY': 'This is also not displayed anywhere.' + 'M_SOCIAL_BLOG_SUMMARY': 'This is also not displayed anywhere.', + 'M_DISABLE_SOCIAL_META_TAGS': False }) # Verify that the social meta tags are present in all pages diff --git a/pelican-theme/test/test_layout.py b/pelican-theme/test/test_layout.py index 108f5644..1363dad6 100644 --- a/pelican-theme/test/test_layout.py +++ b/pelican-theme/test/test_layout.py @@ -101,7 +101,7 @@ class Minimal(MinimalTestCase): 'PLUGIN_PATHS': ['../pelican-plugins'], 'PLUGINS': ['m.htmlsanity'], 'THEME_STATIC_DIR': 'static', - 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i', + 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i', 'static/m-dark.css'], 'M_THEME_COLOR': '#22272e'}) @@ -128,10 +128,12 @@ class OneColumnNavbar(BaseTestCase): def test(self): self.run_pelican({ + 'M_DISABLE_SOCIAL_META_TAGS': True, 'M_LINKS_NAVBAR1': [ ('Features', '#', 'features', []), ('A long item caption that really should not wrap on small screen', '#', '', []), - ('Blog', 'archives.html', '[blog]', [])] + ('Blog', 'archives.html', '[blog]', [])], + 'M_FINE_PRINT': None }) # The navbar should be full 12 columns @@ -143,6 +145,7 @@ class NoFooter(BaseTestCase): def test(self): self.run_pelican({ + 'M_DISABLE_SOCIAL_META_TAGS': True, 'M_FINE_PRINT': None }) @@ -155,6 +158,7 @@ class DisableFinePrint(BaseTestCase): def test(self): self.run_pelican({ + 'M_DISABLE_SOCIAL_META_TAGS': True, 'M_LINKS_FOOTER1': [('Your Brand', 'index.html')], 'M_FINE_PRINT': None }) @@ -169,6 +173,7 @@ class DisableBlogLinks(BaseTestCase): def test(self): self.run_pelican({ + 'M_DISABLE_SOCIAL_META_TAGS': True, 'M_LINKS_FOOTER1': [('Your Brand', 'index.html')], 'M_LINKS_FOOTER4': None, }) diff --git a/pelican-theme/test/test_page.py b/pelican-theme/test/test_page.py index 160ebe0c..3f0fe0bf 100644 --- a/pelican-theme/test/test_page.py +++ b/pelican-theme/test/test_page.py @@ -36,6 +36,7 @@ class Page(PageTestCase): def test(self): self.run_pelican({ + 'M_DISABLE_SOCIAL_META_TAGS': False, 'FORMATTED_FIELDS': ['summary', 'description'] }) @@ -47,7 +48,10 @@ class Minimal(PageTestCase): super().__init__(__file__, 'minimal', *args, **kwargs) def test(self): - self.run_pelican({}) + self.run_pelican({ + # There shouldn't be empty meta tags + 'M_DISABLE_SOCIAL_META_TAGS': False, + }) # The content and summary meta tag shouldn't be there at all self.assertEqual(*self.actual_expected_contents('page.html')) @@ -57,7 +61,10 @@ class Breadcrumb(PageTestCase): super().__init__(__file__, 'breadcrumb', *args, **kwargs) def test(self): - self.run_pelican({}) + self.run_pelican({ + # Breadcrumb should not be exposed in social meta tags + 'M_DISABLE_SOCIAL_META_TAGS': False, + }) # Internal links should work and guide the user from one page to # another @@ -93,7 +100,9 @@ class Landing(PageTestCase): def test(self): self.run_pelican({ 'STATIC_PATHS': ['ship.jpg'], - 'FORMATTED_FIELDS': ['landing'] + 'FORMATTED_FIELDS': ['landing'], + # Verify that the image is propagated to social meta tags + 'M_DISABLE_SOCIAL_META_TAGS': False, }) # The landing field should have the links expanded, header should not @@ -123,6 +132,8 @@ class HtmlEscape(PageTestCase): 'SITENAME': "<&> in site name", 'FORMATTED_FIELDS': ['summary', 'description', 'landing', 'header', 'footer'], 'PAGE_URL': '{slug}.html?and&in&url=""', + # The social meta tags should be escaped properly as well + 'M_DISABLE_SOCIAL_META_TAGS': False, }) # Verify that everything is properly escaped everywhere. The landing @@ -139,6 +150,8 @@ class HtmlEscape(PageTestCase): 'SITENAME': "<&> in site name", 'FORMATTED_FIELDS': ['summary', 'description', 'landing', 'header', 'footer'], 'PAGE_URL': '{slug}.html?and&in&url=""', + # The social meta tags should be escaped properly as well + 'M_DISABLE_SOCIAL_META_TAGS': False, }) # Verify that also the Pelican-produced content has correctly escaped @@ -155,7 +168,8 @@ class GlobalSocialMeta(PageTestCase): 'M_SOCIAL_TWITTER_SITE': '@czmosra', 'M_SOCIAL_TWITTER_SITE_ID': '1537427036', 'M_SOCIAL_IMAGE': 'http://your.brand/static/site.png', - 'M_SOCIAL_BLOG_SUMMARY': 'This is also not displayed anywhere.' + 'M_SOCIAL_BLOG_SUMMARY': 'This is also not displayed anywhere.', + 'M_DISABLE_SOCIAL_META_TAGS': False, }) # Verify that the social meta tags are present