diff --git a/tests/app/test_utils.py b/tests/app/test_utils.py index 9473fce00..4da7e8718 100644 --- a/tests/app/test_utils.py +++ b/tests/app/test_utils.py @@ -4,7 +4,7 @@ from app.utils import merge_jsonlike @pytest.mark.parametrize( - "source_object, destination_object, expected_result", + ("source_object", "destination_object", "expected_result"), [ # simple dicts: ({"a": "b"}, {"c": "d"}, {"a": "b", "c": "d"}), diff --git a/tests/app/utils/test_branding.py b/tests/app/utils/test_branding.py index 4704c7ac9..8c1aae4bd 100644 --- a/tests/app/utils/test_branding.py +++ b/tests/app/utils/test_branding.py @@ -10,7 +10,7 @@ from tests.conftest import create_email_branding @pytest.mark.parametrize("function", [get_email_choices]) @pytest.mark.parametrize( - "org_type, expected_options", + ("org_type", "expected_options"), [ ("federal", []), ("state", []), @@ -30,7 +30,7 @@ def test_get_choices_service_not_assigned_to_org( @pytest.mark.parametrize( - "org_type, branding_id, expected_options", + ("org_type", "branding_id", "expected_options"), [ ( "federal", @@ -86,7 +86,7 @@ def test_get_email_choices_service_assigned_to_org( @pytest.mark.parametrize( - "org_type, branding_id, expected_options", + ("org_type", "branding_id", "expected_options"), [ ( "federal", @@ -141,7 +141,7 @@ def test_get_email_choices_org_has_default_branding( @pytest.mark.parametrize( - "branding_name, expected_options", + ("branding_name", "expected_options"), [ ( "gsa.gov and something else", diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py index 35d48c233..545afd6dd 100644 --- a/tests/app/utils/test_csv.py +++ b/tests/app/utils/test_csv.py @@ -65,8 +65,8 @@ def _get_notifications_csv( return _get -@pytest.fixture(scope="function") -def _get_notifications_csv_mock( +@pytest.fixture() +def get_notifications_csv_mock( mocker, api_user_active, ): @@ -77,7 +77,7 @@ def _get_notifications_csv_mock( @pytest.mark.parametrize( - "created_by_name, expected_content", + ("created_by_name", "expected_content"), [ ( None, @@ -114,7 +114,7 @@ def test_generate_notifications_csv_without_job( @pytest.mark.parametrize( - "original_file_contents, expected_column_headers, expected_1st_row", + ("original_file_contents", "expected_column_headers", "expected_1st_row"), [ ( """ @@ -211,7 +211,7 @@ def test_generate_notifications_csv_without_job( def test_generate_notifications_csv_returns_correct_csv_file( notify_admin, mocker, - _get_notifications_csv_mock, + get_notifications_csv_mock, original_file_contents, expected_column_headers, expected_1st_row, @@ -231,11 +231,11 @@ def test_generate_notifications_csv_returns_correct_csv_file( def test_generate_notifications_csv_only_calls_once_if_no_next_link( notify_admin, - _get_notifications_csv_mock, + get_notifications_csv_mock, ): list(generate_notifications_csv(service_id="1234")) - assert _get_notifications_csv_mock.call_count == 1 + assert get_notifications_csv_mock.call_count == 1 @pytest.mark.parametrize("job_id", ["some", None]) @@ -303,8 +303,14 @@ MockRecipients = namedtuple( @pytest.mark.parametrize( - "rows_with_bad_recipients, rows_with_missing_data, " - "rows_with_message_too_long, rows_with_empty_message, template_type, expected_errors", + ( + "rows_with_bad_recipients", + "rows_with_missing_data", + "rows_with_message_too_long", + "rows_with_empty_message", + "template_type", + "expected_errors", + ), [ ([], [], [], [], "sms", []), ({2}, [], [], [], "sms", ["fix 1 phone number"]), diff --git a/tests/app/utils/test_login.py b/tests/app/utils/test_login.py index fdcd3c437..7e1dc2468 100644 --- a/tests/app/utils/test_login.py +++ b/tests/app/utils/test_login.py @@ -8,10 +8,10 @@ from app.utils.login import email_needs_revalidating @freeze_time("2020-11-27T12:00:00") @pytest.mark.parametrize( ("email_access_validated_at", "expected_result"), - ( + [ ("2020-10-01T11:35:21.726132Z", False), ("2020-07-23T11:35:21.726132Z", True), - ), + ], ) def test_email_needs_revalidating( api_user_active, diff --git a/tests/app/utils/test_time.py b/tests/app/utils/test_time.py index 1ee6bdd24..931fdb816 100644 --- a/tests/app/utils/test_time.py +++ b/tests/app/utils/test_time.py @@ -5,7 +5,7 @@ from app.utils.time import get_current_financial_year, is_less_than_days_ago @pytest.mark.parametrize( - "date_from_db, expected_result", + ("date_from_db", "expected_result"), [ ("2019-11-17T11:35:21.726132Z", True), ("2019-11-16T11:35:21.726132Z", False), @@ -18,13 +18,13 @@ def test_is_less_than_days_ago(date_from_db, expected_result): @pytest.mark.parametrize( - "datetime_string, financial_year", - ( + ("datetime_string", "financial_year"), + [ ("2021-01-01T00:00:00+00:00", 2020), # Start of 2021 ("2021-04-01T03:59:59+00:00", 2020), # One minute before midnight (BST) ("2021-10-01T04:05:00+00:00", 2021), # Midnight (BST) ("2021-12-12T12:12:12+01:00", 2021), # Later in the year - ), + ], ) def test_get_financial_year(datetime_string, financial_year): with freeze_time(datetime_string): diff --git a/tests/app/utils/test_user.py b/tests/app/utils/test_user.py index e6dde3576..d1fd1b844 100644 --- a/tests/app/utils/test_user.py +++ b/tests/app/utils/test_user.py @@ -7,25 +7,25 @@ from app.utils.user import user_has_permissions @pytest.mark.parametrize( "permissions", - ( - [ + [ + ( # Route has one of the permissions which the user has "manage_service" - ], - [ + ), + ( # Route has more than one of the permissions which the user has "manage_templates", "manage_service", - ], - [ + ), + ( # Route has one of the permissions which the user has, and one they do not "manage_service", "send_messages", - ], - [ + ), + ( # Route has no specific permissions required - ], - ), + ), + ], ) def test_permissions( client_request, @@ -50,12 +50,12 @@ def test_permissions( @pytest.mark.parametrize( "permissions", - ( - [ + [ + ( # Route has a permission which the user doesn’t have "send_messages" - ], - ), + ), + ], ) def test_permissions_forbidden( client_request, diff --git a/tests/app/utils/test_user_permissions.py b/tests/app/utils/test_user_permissions.py index 594b62a27..b2930e458 100644 --- a/tests/app/utils/test_user_permissions.py +++ b/tests/app/utils/test_user_permissions.py @@ -7,7 +7,7 @@ from app.utils.user_permissions import ( @pytest.mark.parametrize( - "db_permissions,expected_ui_permissions", + ("db_permissions", "expected_ui_permissions"), [ ( ["manage_templates"],