Use existing user fixture

This commit is contained in:
Chris Hill-Scott
2022-06-06 15:00:37 +01:00
parent f779a97b5c
commit ea9c7e6102

View File

@@ -3,7 +3,6 @@ from flask import request
from werkzeug.exceptions import Forbidden from werkzeug.exceptions import Forbidden
from app.utils.user import user_has_permissions from app.utils.user import user_has_permissions
from tests.conftest import create_user, sample_uuid
@pytest.mark.parametrize('permissions', ( @pytest.mark.parametrize('permissions', (
@@ -20,14 +19,14 @@ from tests.conftest import create_user, sample_uuid
def test_permissions( def test_permissions(
client_request, client_request,
permissions, permissions,
api_user_active,
): ):
request.view_args.update({'service_id': 'foo'}) request.view_args.update({'service_id': 'foo'})
user = create_user(
id=sample_uuid(), api_user_active['permissions'] = {'foo': ['manage_users', 'manage_templates', 'manage_settings']}
permissions={'foo': ['manage_users', 'manage_templates', 'manage_settings']}, api_user_active['services'] = ['foo', 'bar']
services=['foo', 'bar'],
) client_request.login(api_user_active)
client_request.login(user)
@user_has_permissions(*permissions) @user_has_permissions(*permissions)
def index(): def index():
@@ -67,12 +66,10 @@ def test_no_user_returns_redirect_to_sign_in(
def test_user_has_permissions_for_organisation( def test_user_has_permissions_for_organisation(
client_request, client_request,
api_user_active,
): ):
user = create_user( api_user_active['organisations'] = ['org_1', 'org_2']
id=sample_uuid(), client_request.login(api_user_active)
organisations=['org_1', 'org_2'],
)
client_request.login(user)
request.view_args = {'org_id': 'org_2'} request.view_args = {'org_id': 'org_2'}
@@ -117,12 +114,10 @@ def test_cant_use_decorator_without_view_args(
def test_user_doesnt_have_permissions_for_organisation( def test_user_doesnt_have_permissions_for_organisation(
client_request, client_request,
api_user_active,
): ):
user = create_user( api_user_active['organisations'] = ['org_1', 'org_2']
id=sample_uuid(), client_request.login(api_user_active)
organisations=['org_1', 'org_2'],
)
client_request.login(user)
request.view_args = {'org_id': 'org_3'} request.view_args = {'org_id': 'org_3'}
@@ -136,13 +131,11 @@ def test_user_doesnt_have_permissions_for_organisation(
def test_user_with_no_permissions_to_service_goes_to_templates( def test_user_with_no_permissions_to_service_goes_to_templates(
client_request, client_request,
api_user_active,
): ):
user = create_user( api_user_active['permissions'] = {'foo': ['manage_users', 'manage_templates', 'manage_settings']}
id=sample_uuid(), api_user_active['services'] = ['foo', 'bar']
permissions={'foo': ['manage_users', 'manage_templates', 'manage_settings']}, client_request.login(api_user_active)
services=['foo', 'bar'],
)
client_request.login(user)
request.view_args = {'service_id': 'bar'} request.view_args = {'service_id': 'bar'}
@user_has_permissions() @user_has_permissions()