From f779a97b5c7c88f408ea44d254a9b1d1d307ca8a Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 6 Jun 2022 13:55:25 +0100 Subject: [PATCH] Use decorator as decorator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This syntax makes it clearer what is being tested here, because it’s unusual to see a decorator being manually called with function as its first argument. It’s also consistent with how the later tests in this file are written. --- tests/app/utils/test_user.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/app/utils/test_user.py b/tests/app/utils/test_user.py index 655e027d2..04c56c588 100644 --- a/tests/app/utils/test_user.py +++ b/tests/app/utils/test_user.py @@ -2,7 +2,6 @@ import pytest from flask import request from werkzeug.exceptions import Forbidden -from app.main.views.index import index from app.utils.user import user_has_permissions from tests.conftest import create_user, sample_uuid @@ -30,9 +29,11 @@ def test_permissions( ) client_request.login(user) - decorator = user_has_permissions(*permissions) - decorated_index = decorator(index) - decorated_index() + @user_has_permissions(*permissions) + def index(): + pass + + index() def test_restrict_admin_usage( @@ -42,20 +43,24 @@ def test_restrict_admin_usage( request.view_args.update({'service_id': 'foo'}) client_request.login(platform_admin_user) - decorator = user_has_permissions(restrict_admin_usage=True) - decorated_index = decorator(index) + @user_has_permissions(restrict_admin_usage=True) + def index(): + pass with pytest.raises(Forbidden): - decorated_index() + index() def test_no_user_returns_redirect_to_sign_in( client_request ): client_request.logout() - decorator = user_has_permissions() - decorated_index = decorator(index) - response = decorated_index() + + @user_has_permissions() + def index(): + pass + + response = index() assert response.status_code == 302 assert response.location.startswith('/sign-in?next=')