about summary refs log tree commit diff
path: root/tests/unit/auth/test_resources.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unit/auth/test_resources.py')
-rw-r--r--tests/unit/auth/test_resources.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/unit/auth/test_resources.py b/tests/unit/auth/test_resources.py
index 824062d..b756cd9 100644
--- a/tests/unit/auth/test_resources.py
+++ b/tests/unit/auth/test_resources.py
@@ -31,24 +31,24 @@ uuid_fn = lambda : uuid.UUID("d32611e3-07fc-4564-b56c-786c6db6de2b")
          create_resource_failure,
          create_resource_failure,
          create_resource_failure))))
-def test_create_resource(mocker, test_app, test_users_in_group, user, expected):
+def test_create_resource(mocker, fxtr_app, fxtr_users_in_group, user, expected):
     """Test that resource creation works as expected."""
     mocker.patch("gn3.auth.authorisation.resources.uuid4", uuid_fn)
-    conn, _group, _users = test_users_in_group
-    with test_app.app_context() as flask_context:
+    conn, _group, _users = fxtr_users_in_group
+    with fxtr_app.app_context() as flask_context:
         flask_context.g.user = user
         assert create_resource(conn, "test_resource", resource_category) == expected
 
 SORTKEY = lambda resource: resource.resource_id
 
 @pytest.mark.unit_test
-def test_public_resources(fixture_resources):
+def test_public_resources(fxtr_resources):
     """
     GIVEN: some resources in the database
     WHEN: public resources are requested
     THEN: only list the resources that are public
     """
-    conn, _res = fixture_resources
+    conn, _res = fxtr_resources
     assert sorted(public_resources(conn), key=SORTKEY) == sorted(tuple(
         res for res in conftest.TEST_RESOURCES if res.public), key=SORTKEY)
 
@@ -68,11 +68,11 @@ PUBLIC_RESOURCES = sorted(conftest.TEST_RESOURCES_PUBLIC, key=SORTKEY)
                  conftest.TEST_RESOURCES_PUBLIC),
              key=SORTKEY),
          PUBLIC_RESOURCES, PUBLIC_RESOURCES))))
-def test_user_resources(fixture_group_user_roles, user, expected):
+def test_user_resources(fxtr_group_user_roles, user, expected):
     """
     GIVEN: some resources in the database
     WHEN: a particular user's resources are requested
     THEN: list only the resources for which the user can access
     """
-    conn = fixture_group_user_roles
+    conn = fxtr_group_user_roles
     assert sorted(user_resources(conn, user), key=SORTKEY) == expected