From 1669f5a5ef054c786cb4a9b2a8ad3b0e31d41240 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 15 Nov 2024 11:23:42 +1000
Subject: [PATCH] [QOLDEV-1011] mock out global object during auth test

---
 ckanext/datarequests/tests/test_auth.py    | 3 +++
 ckanext/datarequests/tests/test_helpers.py | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckanext/datarequests/tests/test_auth.py b/ckanext/datarequests/tests/test_auth.py
index 47f69fee..62f91664 100644
--- a/ckanext/datarequests/tests/test_auth.py
+++ b/ckanext/datarequests/tests/test_auth.py
@@ -58,9 +58,12 @@ class AuthTest(unittest.TestCase):
     def setUp(self):
         self._get_action = auth.get_action
         auth.get_action = MagicMock()
+        self._g = controller_functions.g
+        controller_functions.g = MagicMock()
 
     def tearDown(self):
         auth.get_action = self._get_action
+        controller_functions.g = self._g
 
     @parameterized.expand([
         # Data Requests
diff --git a/ckanext/datarequests/tests/test_helpers.py b/ckanext/datarequests/tests/test_helpers.py
index c2e9838b..648de012 100644
--- a/ckanext/datarequests/tests/test_helpers.py
+++ b/ckanext/datarequests/tests/test_helpers.py
@@ -32,14 +32,11 @@ def setUp(self):
         self.db_patch = patch('ckanext.datarequests.helpers.db')
         self.db_patch.start()
 
-        self._c = helpers.c
-        helpers.c = MagicMock()
-        helpers.c.userobj.id = '12345'
+        helpers.tk.g.userobj.id = '12345'
 
     def tearDown(self):
         self.tk_patch.stop()
         self.db_patch.stop()
-        helpers.c = self._c
 
     def test_get_comments_number(self):
         # Mocking