diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py
index 730ce979af..38daebe5e8 100644
--- a/frappe/website/doctype/web_page/test_web_page.py
+++ b/frappe/website/doctype/web_page/test_web_page.py
@@ -7,24 +7,24 @@ from frappe.tests import set_request
test_records = frappe.get_test_records('Web Page')
+def get_page_content(route):
+ set_request(method='GET', path = route)
+ response = frappe.website.render.render()
+ return frappe.as_unicode(response.data)
+
class TestWebPage(unittest.TestCase):
def setUp(self):
frappe.db.sql("delete from `tabWeb Page`")
for t in test_records:
frappe.get_doc(t).insert()
- def get_page_content(self, route):
- set_request(method='GET', path = route)
- response = frappe.website.render.render()
- return frappe.as_unicode(response.data)
-
def test_check_sitemap(self):
resolve_route("test-web-page-1")
resolve_route("test-web-page-1/test-web-page-2")
resolve_route("test-web-page-1/test-web-page-3")
def test_base_template(self):
- content = self.get_page_content('/_test/_test_custom_base.html')
+ content = get_page_content('/_test/_test_custom_base.html')
# assert the text in base template is rendered
self.assertTrue('
This is for testing
' in frappe.as_unicode(content))
@@ -43,14 +43,14 @@ class TestWebPage(unittest.TestCase):
main_section_html = 'html content
'
)).insert()
- self.assertTrue('rich text' in self.get_page_content('/test-content-type'))
+ self.assertTrue('rich text' in get_page_content('/test-content-type'))
web_page.content_type = 'Markdown'
web_page.save()
- self.assertTrue('markdown content' in self.get_page_content('/test-content-type'))
+ self.assertTrue('markdown content' in get_page_content('/test-content-type'))
web_page.content_type = 'HTML'
web_page.save()
- self.assertTrue('html content' in self.get_page_content('/test-content-type'))
+ self.assertTrue('html content' in get_page_content('/test-content-type'))
diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py
index ab213fbaca..d9500ec34b 100644
--- a/frappe/website/doctype/web_page/web_page.py
+++ b/frappe/website/doctype/web_page/web_page.py
@@ -11,7 +11,7 @@ from jinja2.exceptions import TemplateSyntaxError
import frappe
from frappe import _
-from frappe.utils import get_datetime, now, strip_html, markdown
+from frappe.utils import get_datetime, now, strip_html
from frappe.utils.jinja import render_template
from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow
from frappe.website.router import resolve_route