From 5dbf32309cf9226137f3de47720c0aa9e3de1e6e Mon Sep 17 00:00:00 2001 From: Kevin Carrogan Date: Fri, 3 Jan 2025 13:19:02 +0000 Subject: [PATCH 1/2] Use dynamic future year to stop tests failing --- unit_tests/exporter/goods/forms/test_forms.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/unit_tests/exporter/goods/forms/test_forms.py b/unit_tests/exporter/goods/forms/test_forms.py index 1cd864af95..263b6b1472 100644 --- a/unit_tests/exporter/goods/forms/test_forms.py +++ b/unit_tests/exporter/goods/forms/test_forms.py @@ -1,3 +1,5 @@ +import datetime + from unittest.mock import patch import pytest @@ -590,25 +592,28 @@ def test_registered_firearms_dealer_form(data, valid, error_field, error_message assert form.errors[error_field][0] == error_message +FUTURE_YEAR = str(datetime.date.today().year + 1) + + @pytest.mark.parametrize( "data, files, valid, error_field, error_message", ( ( - {"reference_code": "ref_code", "expiry_date_0": 1, "expiry_date_1": 1, "expiry_date_2": 2025}, + {"reference_code": "ref_code", "expiry_date_0": 1, "expiry_date_1": 1, "expiry_date_2": FUTURE_YEAR}, {"file": SimpleUploadedFile("test", b"test_content")}, True, None, None, ), ( - {"reference_code": "ref_code", "expiry_date_0": 1, "expiry_date_1": 1, "expiry_date_2": 2025}, + {"reference_code": "ref_code", "expiry_date_0": 1, "expiry_date_1": 1, "expiry_date_2": FUTURE_YEAR}, {"file": ""}, False, "file", "Select certificate file to upload", ), ( - {"reference_code": "", "expiry_date_0": 1, "expiry_date_1": 1, "expiry_date_2": 2025}, + {"reference_code": "", "expiry_date_0": 1, "expiry_date_1": 1, "expiry_date_2": FUTURE_YEAR}, {"file": SimpleUploadedFile("test", b"test_content")}, False, "reference_code", @@ -638,7 +643,7 @@ def test_attach_fiream_dealer_certificate_form(data, files, valid, error_field, if valid: assert form.cleaned_data["expiry_date_day"] == "1" assert form.cleaned_data["expiry_date_month"] == "1" - assert form.cleaned_data["expiry_date_year"] == "2025" + assert form.cleaned_data["expiry_date_year"] == str(FUTURE_YEAR) else: assert form.errors[error_field][0] == error_message From 6558230204c0b10f22890046795f1e42c300a1c6 Mon Sep 17 00:00:00 2001 From: Kevin Carrogan Date: Fri, 3 Jan 2025 13:23:27 +0000 Subject: [PATCH 2/2] Remove superfluous str call --- unit_tests/exporter/goods/forms/test_forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit_tests/exporter/goods/forms/test_forms.py b/unit_tests/exporter/goods/forms/test_forms.py index 263b6b1472..e1e7e30dcf 100644 --- a/unit_tests/exporter/goods/forms/test_forms.py +++ b/unit_tests/exporter/goods/forms/test_forms.py @@ -592,7 +592,7 @@ def test_registered_firearms_dealer_form(data, valid, error_field, error_message assert form.errors[error_field][0] == error_message -FUTURE_YEAR = str(datetime.date.today().year + 1) +FUTURE_YEAR = datetime.date.today().year + 1 @pytest.mark.parametrize(