Merge pull request #8923 from gavindsouza/legacy-tests-cleanup

chore: cleanup redundant function definitions, sort imports

frappe/tests/__init__.py

@@ -1,46 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals
-
-import frappe
-from werkzeug.wrappers import Request
-from werkzeug.test import EnvironBuilder
-
-def set_request(**kwargs):
-	builder = EnvironBuilder(**kwargs)
-	frappe.local.request = Request(builder.get_environ())
-
-def insert_test_data(doctype, sort_fn=None):
-	import frappe.model
-	data = get_test_doclist(doctype)
-	if sort_fn:
-		data = sorted(data, key=sort_fn)
-
-	for doclist in data:
-		frappe.insert(doclist)
-
-def get_test_doclist(doctype, name=None):
-	"""get test doclist, collection of doclists"""
-	import os
-	from frappe import conf
-	from frappe.modules.utils import peval_doclist
-	from frappe.modules import scrub
-
-	doctype = scrub(doctype)
-	doctype_path = os.path.join(os.path.dirname(os.path.abspath(conf.__file__)),
-		conf.test_data_path, doctype)
-
-	if name:
-		with open(os.path.join(doctype_path, scrub(name) + ".json"), 'r') as txtfile:
-			doclist = peval_doclist(txtfile.read())
-
-		return doclist
-
-	else:
-		all_doclists = []
-		for fname in filter(lambda n: n.endswith(".json"), os.listdir(doctype_path)):
-			with open(os.path.join(doctype_path, scrub(fname)), 'r') as txtfile:
-				all_doclists.append(peval_doclist(txtfile.read()))
-
-		return all_doclists

frappe/tests/test_recorder.py

@@ -7,7 +7,7 @@ from __future__ import unicode_literals
 import unittest
 import frappe
 import frappe.recorder
-from .test_website import set_request
+from frappe.utils import set_request
 
 import sqlparse
 

frappe/tests/test_sitemap.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
 import frappe, unittest
-from frappe.tests.test_website import get_html_for_route
+from frappe.utils import get_html_for_route
 
 class TestSitemap(unittest.TestCase):
 	def test_sitemap(self):

frappe/tests/test_twofactor.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import unittest, frappe, pyotp
 from frappe.auth import HTTPRequest
 from frappe.utils import cint
-from frappe.tests import set_request
+from frappe.utils import set_request
 from frappe.auth import validate_ip_address
 from frappe.twofactor import (should_run_2fa, authenticate_for_2factor, get_cached_user_pass,
 	two_factor_is_enabled_for_, confirm_otp_token, get_otpsecret_for_, get_verification_obj)

frappe/tests/test_website.py

@@ -1,23 +1,13 @@
 from __future__ import unicode_literals
 
-import frappe, unittest
-from werkzeug.wrappers import Request
-from werkzeug.test import EnvironBuilder
+import unittest
 
+import frappe
 from frappe.website import render
+from frappe.utils import set_request
 
-def set_request(**kwargs):
-	builder = EnvironBuilder(**kwargs)
-	frappe.local.request = Request(builder.get_environ())
-
-def get_html_for_route(route):
-	set_request(method='GET', path=route)
-	response = render.render()
-	html = frappe.safe_decode(response.get_data())
-	return html
 
 class TestWebsite(unittest.TestCase):
-
 	def test_page_load(self):
 		frappe.set_user('Guest')
 		set_request(method='POST', path='login')
@@ -76,4 +66,3 @@ class TestWebsite(unittest.TestCase):
 
 		delattr(frappe.hooks, 'website_redirects')
 		frappe.cache().delete_key('app_hooks')
-

frappe/utils/__init__.py

@@ -685,3 +685,10 @@ def set_request(**kwargs):
 	from werkzeug.wrappers import Request
 	builder = EnvironBuilder(**kwargs)
 	frappe.local.request = Request(builder.get_environ())
+
+def get_html_for_route(route):
+	from frappe.website import render
+	set_request(method='GET', path=route)
+	response = render.render()
+	html = frappe.safe_decode(response.get_data())
+	return html