Fix tests on GoogleAdmin, expect new response structure

test/test_google/test_google_admin.py

@@ -31,36 +31,41 @@ def setUp(self):
         self.google_admin = MockGoogleAdmin()
 
     def test_aliases(self):
-        self.google_admin.client.request = MagicMock(
-            return_value=(
-                "",
-                '{"aliases": [{"alias": "[email protected]"},'
-                '{"alias": "fakeemail8@fakedomain'
-                '.com"}]}'.encode(),
-            )
-        )
+        response_mock = MagicMock()
+        self.google_admin.client.request = MagicMock(return_value=response_mock)
+        response_mock.json.return_value = {
+            "aliases": [
+                {"alias": "fakeemail7@fakedomain.com"},
+                {"alias": "fakeemail8@fakedomain.com"},
+            ]
+        }
         assert_matching_tables(self.google_admin.get_aliases("1"), self.mock_aliases)
 
     def test_all_group_members(self):
-        self.google_admin.client.request = MagicMock(
-            return_value=(
-                "",
-                '{"members": [{"email": "[email protected]"}]}'.encode(),
-            )
-        )
+        response_mock = MagicMock()
+        self.google_admin.client.request = MagicMock(return_value=response_mock)
+        response_mock.json.return_value = {"members": [{"email": "[email protected]"}]}
         assert_matching_tables(
             self.google_admin.get_all_group_members("1"), self.mock_all_group_members
         )
 
     def test_all_groups(self):
-        self.google_admin.client.request = MagicMock(
-            return_value=(
-                "",
-                '{"groups": [{"aliases": ["[email protected]", "[email protected]"], "e'  # noqa: E501
-                'mail": "[email protected]", "id": 1}, {"email": "[email protected]", "'  # noqa: E501
-                'id": 2}, {"email": "[email protected]", "id": 3}]}'.encode(),
-            )
-        )
+        response_mock = MagicMock()
+        self.google_admin.client.request = MagicMock(return_value=response_mock)
+        response_mock.json.return_value = {
+            "groups": [
+                {
+                    "aliases": [
+                        "[email protected]",
+                        "[email protected]",
+                    ],
+                    "email": "[email protected]",
+                    "id": 1,
+                },
+                {"email": "[email protected]", "id": 2},
+                {"email": "[email protected]", "id": 3},
+            ]
+        }
         assert_matching_tables(
             self.google_admin.get_all_groups({"domain": "fakedomain.com"}),
             self.mock_all_groups,