| commit | d1b1156b8ce2d656db0097af28a55d190ea596c2 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Fri Nov 29 18:49:34 2019 +0530 |
| committer | GitHub <noreply@github.com> | Fri Nov 29 18:49:34 2019 +0530 |
| tree | fcbbe6edf297b3400212a547187ddf2b68b6b6d1 | |
| parent | 611d2ccd04edf186718704b60f6f0f125c3f9e32 [diff] | |
| parent | b3af2adc4a145b5d540fbaef030c9a4a1a6ced47 [diff] |
Merge branch 'develop' into set-request-util
diff --git a/erpnext/portal/doctype/homepage/test_homepage.py b/erpnext/portal/doctype/homepage/test_homepage.py index b262c46..bf5c402 100644 --- a/erpnext/portal/doctype/homepage/test_homepage.py +++ b/erpnext/portal/doctype/homepage/test_homepage.py
@@ -5,7 +5,7 @@ import frappe import unittest -from frappe.tests.test_website import set_request +from frappe.utils import set_request from frappe.website.render import render class TestHomepage(unittest.TestCase):
diff --git a/erpnext/portal/doctype/homepage_section/test_homepage_section.py b/erpnext/portal/doctype/homepage_section/test_homepage_section.py index c52b7a9..5b3196d 100644 --- a/erpnext/portal/doctype/homepage_section/test_homepage_section.py +++ b/erpnext/portal/doctype/homepage_section/test_homepage_section.py
@@ -6,7 +6,7 @@ import frappe import unittest from bs4 import BeautifulSoup -from frappe.tests.test_website import set_request +from frappe.utils import set_request from frappe.website.render import render class TestHomepageSection(unittest.TestCase):