From 34592aa0696eaf6eb7518e5309a413d4d755ddb9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 28 Apr 2021 12:50:48 +0530 Subject: [PATCH] test: Use get_response instead of render in tests --- frappe/website/doctype/blog_post/test_blog_post.py | 10 +++++----- frappe/website/doctype/web_page/test_web_page.py | 4 ++-- .../website/doctype/web_template/test_web_template.py | 7 +++---- .../website_route_meta/test_website_route_meta.py | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index f0fc484a31..24083c76cd 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -7,7 +7,7 @@ from bs4 import BeautifulSoup import re from frappe.utils import set_request -from frappe.website.render import render +from frappe.website.serve import get_response from frappe.utils import random_string from frappe.website.doctype.blog_post.blog_post import get_blog_list from frappe.website.website_generator import WebsiteGenerator @@ -22,7 +22,7 @@ class TestBlogPost(unittest.TestCase): filters={'published': 1, 'route': ('!=', '')}, limit =1) set_request(path=pages[0].route) - response = render() + response = get_response() self.assertTrue(response.status_code, 200) @@ -36,7 +36,7 @@ class TestBlogPost(unittest.TestCase): frappe.db.set_value('Blog Post', pages[0].name, 'route', 'test-route-000') set_request(path='test-route-000') - response = render() + response = get_response() self.assertTrue(response.status_code, 404) @@ -46,7 +46,7 @@ class TestBlogPost(unittest.TestCase): # Visit the blog post page set_request(path=blog.route) - blog_page_response = render() + blog_page_response = get_response() blog_page_html = frappe.safe_decode(blog_page_response.get_data()) # On blog post page find link to the category page @@ -56,7 +56,7 @@ class TestBlogPost(unittest.TestCase): # Visit the category page (by following the link found in above stage) set_request(path=category_page_url) - category_page_response = render() + category_page_response = get_response() category_page_html = frappe.safe_decode(category_page_response.get_data()) # Category page should contain the blog post title diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index a481337978..2a175f6f77 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals import unittest import frappe from frappe.website.router import resolve_route -import frappe.website.render +from frappe.website.serve import get_response from frappe.utils 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() + response = get_response() return frappe.as_unicode(response.data) class TestWebPage(unittest.TestCase): diff --git a/frappe/website/doctype/web_template/test_web_template.py b/frappe/website/doctype/web_template/test_web_template.py index b4ea9e2f97..ed2ed70c14 100644 --- a/frappe/website/doctype/web_template/test_web_template.py +++ b/frappe/website/doctype/web_template/test_web_template.py @@ -7,8 +7,7 @@ import frappe import unittest from bs4 import BeautifulSoup from frappe.utils import set_request -from frappe.website.render import render - +from frappe.website.serve import get_response class TestWebTemplate(unittest.TestCase): def test_render_web_template_with_values(self): @@ -36,7 +35,7 @@ class TestWebTemplate(unittest.TestCase): self.create_web_page() set_request(method="GET", path="test-web-template") - response = render() + response = get_response() self.assertEqual(response.status_code, 200) @@ -58,7 +57,7 @@ class TestWebTemplate(unittest.TestCase): frappe.conf.developer_mode = 1 set_request(method="GET", path="test-web-template") - response = render() + response = get_response() self.assertEqual(response.status_code, 200) html = frappe.safe_decode(response.get_data()) diff --git a/frappe/website/doctype/website_route_meta/test_website_route_meta.py b/frappe/website/doctype/website_route_meta/test_website_route_meta.py index 0ccedb0ca4..d385a6e59b 100644 --- a/frappe/website/doctype/website_route_meta/test_website_route_meta.py +++ b/frappe/website/doctype/website_route_meta/test_website_route_meta.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe import unittest from frappe.utils import set_request -from frappe.website.render import render +from frappe.website.serve import get_response test_dependencies = ['Blog Post'] class TestWebsiteRouteMeta(unittest.TestCase): @@ -31,7 +31,7 @@ class TestWebsiteRouteMeta(unittest.TestCase): # set request on this route set_request(path=blog.route) - response = render() + response = get_response() self.assertTrue(response.status_code, 200)