Updated test roles and scopes to correspond to new group structure

jupyterhub/tests/test_roles.py

@@ -568,9 +568,9 @@ async def test_load_roles_services(tmpdir, request, preserve_scopes):
 async def test_load_roles_groups(tmpdir, request):
     """Test loading predefined roles for groups in app.py"""
     groups_to_load = {
-        'group1': ['gandalf'],
-        'group2': ['bilbo', 'gargamel'],
-        'group3': ['cyclops'],
+        'group1':{'users': ['gandalf'], 'properties': {}},
+        'group2':{'users':['bilbo', 'gargamel'], 'properties': {}},
+        'group3':{'users': ['cyclops'], 'properties': {}},
     }
     roles_to_load = [
         {

jupyterhub/tests/test_scopes.py

@@ -747,6 +747,7 @@ async def test_service_model_filtering(
                 'name',
                 'kind',
                 'users',
+                'properties',
             },
         ),
         (