From c1d775162c2a657f9e8001914cc216cd70460371 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 18 Feb 2021 21:36:28 +0000
Subject: Patched utility.authentication_tools.g as TestUserSession because
 otherwise the str.encode failed on the mock.Mock() object, and this also
 seems consistent with the way it's done in a later method

---
 wqflask/tests/unit/utility/test_authentication_tools.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'wqflask/tests/unit/utility')

diff --git a/wqflask/tests/unit/utility/test_authentication_tools.py b/wqflask/tests/unit/utility/test_authentication_tools.py
index 5c391be5..6d817f5e 100644
--- a/wqflask/tests/unit/utility/test_authentication_tools.py
+++ b/wqflask/tests/unit/utility/test_authentication_tools.py
@@ -5,7 +5,6 @@ from unittest import mock
 from utility.authentication_tools import check_resource_availability
 from utility.authentication_tools import add_new_resource
 
-
 class TestResponse:
     """Mock Test Response after a request"""
     @property
@@ -38,7 +37,7 @@ class TestCheckResourceAvailability(unittest.TestCase):
     """Test methods related to checking the resource availability"""
     @mock.patch('utility.authentication_tools.add_new_resource')
     @mock.patch('utility.authentication_tools.Redis')
-    @mock.patch('utility.authentication_tools.g', mock.Mock())
+    @mock.patch('utility.authentication_tools.g', TestUserSession())
     @mock.patch('utility.authentication_tools.get_resource_id')
     def test_check_resource_availability_default_mask(
             self,
@@ -46,6 +45,7 @@ class TestCheckResourceAvailability(unittest.TestCase):
             redis_mock,
             add_new_resource_mock):
         """Test the resource availability with default mask"""
+
         resource_id_mock.return_value = 1
         redis_mock.smembers.return_value = []
         test_dataset = mock.MagicMock()
@@ -64,7 +64,7 @@ class TestCheckResourceAvailability(unittest.TestCase):
             redis_mock,
             add_new_resource_mock,
             requests_mock):
-        """Test the resource availability with default mask"""
+        """Test the resource availability with non-default mask"""
         resource_id_mock.return_value = 1
         redis_mock.smembers.return_value = []
         add_new_resource_mock.return_value = {"default_mask": 2}
-- 
cgit v1.2.3


From cb039b3e7e8a3a260edc80b0de79fc27af795cf0 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 18 Feb 2021 21:58:58 +0000
Subject: Fixed TestCheckResourceAvailability to make it work after realizing
 that Redis.smembers apparently returns values as bytes

---
 wqflask/tests/unit/utility/test_authentication_tools.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask/tests/unit/utility')

diff --git a/wqflask/tests/unit/utility/test_authentication_tools.py b/wqflask/tests/unit/utility/test_authentication_tools.py
index 6d817f5e..fff5fd8f 100644
--- a/wqflask/tests/unit/utility/test_authentication_tools.py
+++ b/wqflask/tests/unit/utility/test_authentication_tools.py
@@ -89,7 +89,7 @@ class TestCheckResourceAvailability(unittest.TestCase):
             requests_mock):
         """Test the resource availability if the user is the super user"""
         resource_id_mock.return_value = 1
-        redis_mock.smembers.return_value = ["Jane"]
+        redis_mock.smembers.return_value = [b"Jane"]
         add_new_resource_mock.return_value = {"default_mask": 2}
         requests_mock.return_value = TestResponse()
         test_dataset = mock.MagicMock()
-- 
cgit v1.2.3