From 85bb89cb94f6bc0990cb8c32803b4df38a262b25 Mon Sep 17 00:00:00 2001 From: Hlamalani Date: Wed, 14 Feb 2024 15:05:51 +0200 Subject: [PATCH] check footer and list item max characters when importing --- home/import_content_pages.py | 9 +++------ home/tests/test_content_import_export.py | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/home/import_content_pages.py b/home/import_content_pages.py index 3a5046a0..752b1798 100644 --- a/home/import_content_pages.py +++ b/home/import_content_pages.py @@ -258,20 +258,17 @@ def create_shadow_content_page_from_row( parent=row.parent, related_pages=row.related_pages, ) - errors = {} + if len(row.footer) > 60: - errors["footer"] = ValidationError( + raise ImportException( f"footer too long: {row.footer}", row.page_id ) if len(row.list_items) > 24: - errors["list_items"] = ValidationError( + raise ImportException( f"list_items too long: {row.list_items}", row.page_id ) - if errors: - raise ImportException(errors) - self.shadow_pages[(row.slug, locale)] = page self.add_message_to_shadow_content_page_from_row(row, locale) diff --git a/home/tests/test_content_import_export.py b/home/tests/test_content_import_export.py index 70736f8d..7c580def 100644 --- a/home/tests/test_content_import_export.py +++ b/home/tests/test_content_import_export.py @@ -920,7 +920,6 @@ def test_field_maximum_characters(self, csv_impexp: ImportExport) -> None: assert isinstance(e.value, ImportException) assert e.value.row_num == 4 - assert isinstance(e.value.message["footer"], ValidationError) @pytest.fixture(params=["csv", "xlsx"])