From 6994cc684f342667699bacc4ca6825b880fbc086 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 11 May 2022 13:28:38 +0530 Subject: [PATCH 1/2] fix(metatags): check if value is set for key --- frappe/website/website_components/metatags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/website_components/metatags.py b/frappe/website/website_components/metatags.py index 0551f946ef..3d35be5514 100644 --- a/frappe/website/website_components/metatags.py +++ b/frappe/website/website_components/metatags.py @@ -16,7 +16,7 @@ class MetaTags: def init_metatags_from_context(self): for key in METATAGS: - if key not in self.tags and self.context.get(key): + if not self.tags.get(key) and self.context.get(key): self.tags[key] = self.context[key] if not self.tags.get("title"): From eeab5edf5f9400dc174f7c01ab636b70fde7f6b7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 11 May 2022 13:29:03 +0530 Subject: [PATCH 2/2] test: test for metatag rendering --- frappe/tests/test_website.py | 5 +++++ frappe/www/_test/_test_metatags.html | 5 +++++ frappe/www/_test/_test_metatags.py | 8 ++++++++ 3 files changed, 18 insertions(+) create mode 100644 frappe/www/_test/_test_metatags.html create mode 100644 frappe/www/_test/_test_metatags.py diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 9fa0025e38..37ac611b4e 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -312,6 +312,11 @@ class TestWebsite(unittest.TestCase): self.assertIn("test.__test", content) self.assertNotIn("frappe.exceptions.ValidationError: Illegal template", content) + def test_metatags(self): + content = get_response_content("/_test/_test_metatags") + self.assertIn('', content) + self.assertIn('', content) + def set_home_page_hook(key, value): from frappe import hooks diff --git a/frappe/www/_test/_test_metatags.html b/frappe/www/_test/_test_metatags.html new file mode 100644 index 0000000000..cd430938a4 --- /dev/null +++ b/frappe/www/_test/_test_metatags.html @@ -0,0 +1,5 @@ +--- +base_template: frappe/templates/web.html +--- + +

Test Metatags

\ No newline at end of file diff --git a/frappe/www/_test/_test_metatags.py b/frappe/www/_test/_test_metatags.py new file mode 100644 index 0000000000..b5b504a246 --- /dev/null +++ b/frappe/www/_test/_test_metatags.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals + + +def get_context(): + return {"title": "Test Title Metatag", "description": "Test Description for Metatag"}