From f7d5cb504a951058e9e6e618de7796fcc9bc4e63 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 3 Aug 2022 12:00:09 +0530
Subject: [PATCH] test(oauth-client): Generate new client for each test

---
 .../doctype/oauth_client/test_records.json    | 15 ----------
 frappe/tests/test_oauth20.py                  | 30 ++++++++++++++++---
 2 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 frappe/integrations/doctype/oauth_client/test_records.json

diff --git a/frappe/integrations/doctype/oauth_client/test_records.json b/frappe/integrations/doctype/oauth_client/test_records.json
deleted file mode 100644
index 11e6338a87..0000000000
--- a/frappe/integrations/doctype/oauth_client/test_records.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
- {
-  "app_name": "_Test OAuth Client",
-  "client_secret": "test_client_secret", 
-  "default_redirect_uri": "http://localhost", 
-  "docstatus": 0, 
-  "doctype": "OAuth Client", 
-  "grant_type": "Authorization Code", 
-  "name": "test_client_id", 
-  "redirect_uris": "http://localhost", 
-  "response_type": "Code", 
-  "scopes": "all openid", 
-  "skip_authorization": 1
- }
-]
diff --git a/frappe/tests/test_oauth20.py b/frappe/tests/test_oauth20.py
index a5bd3739d3..544a11d201 100644
--- a/frappe/tests/test_oauth20.py
+++ b/frappe/tests/test_oauth20.py
@@ -51,12 +51,8 @@ class FrappeRequestTestCase(unittest.TestCase):
 class TestOAuth20(FrappeRequestTestCase):
 	@classmethod
 	def setUpClass(cls):
-		make_test_records("OAuth Client", force=True)
 		make_test_records("User")
 
-		client = frappe.get_all("OAuth Client", fields=["*"])[0]
-		cls.client_id = client.get("client_id")
-		cls.client_secret = client.get("client_secret")
 		cls.form_header = {"content-type": "application/x-www-form-urlencoded"}
 		cls.scope = "all openid"
 		cls.redirect_uri = "http://localhost"
@@ -69,6 +65,32 @@ class TestOAuth20(FrappeRequestTestCase):
 		frappe_login_key.insert(ignore_if_duplicate=True)
 		frappe.db.commit()
 
+	def setUp(self):
+		self.oauth_client = frappe.new_doc("OAuth Client")
+		self.oauth_client.update(
+			{
+				"app_name": "_Test OAuth Client",
+				"client_secret": "test_client_secret",
+				"default_redirect_uri": "http://localhost",
+				"docstatus": 0,
+				"doctype": "OAuth Client",
+				"grant_type": "Authorization Code",
+				"name": "test_client_id",
+				"redirect_uris": "http://localhost",
+				"response_type": "Code",
+				"scopes": "all openid",
+				"skip_authorization": 1,
+			}
+		)
+		self.oauth_client.insert()
+
+		self.client_id = self.oauth_client.get("client_id")
+		self.client_secret = self.oauth_client.get("client_secret")
+
+	def tearDown(self):
+		self.oauth_client.delete(force=True)
+		frappe.db.rollback()
+
 	def test_invalid_login(self):
 		with suppress_stdout():
 			self.assertFalse(check_valid_openid_response(client=self))