✅ test: Fix gherkin tests and assertions

Author: CharString

backend/src/openbeheer/clients.py

@@ -34,15 +34,15 @@ def build_client_with_logging(*args: P.args, **kwargs: P.kwargs) -> C:
 
         @wraps(_original_request)
         def logging_request(method: str | bytes, url: str | bytes, *args, **kwargs):
-            logger.info(
+            logger.debug(
                 f"{method} request",
                 base_url=client.base_url,
                 url=url,
                 **kwargs,
             )
             with request_lock:
                 response = _original_request(method, url, *args, **kwargs)
-            logger.info(
+            logger.debug(
                 f"{method} response",
                 base_url=client.base_url,
                 path=url,

backend/src/openbeheer/utils/gherkin_e2e.py

@@ -140,6 +140,7 @@ def zaaktypen_exist(
                 padded_sequence_number = str(i).zfill(3)
 
                 overrides = {
+                    "identificatie": f"ZAAKTYPE-2025-{padded_sequence_number.zfill(10)}",
                     "aanleiding": f"New Zaaktype {padded_sequence_number}",
                     "doel": f"New Zaaktype {padded_sequence_number}",
                     "onderwerp": f"New Zaaktype {padded_sequence_number}",
@@ -302,7 +303,12 @@ def user_clicks_on_checkbox(self, page: Page, label: str) -> None:
             page.get_by_label(label).click()
 
         def user_fills_form_field(
-            self, page: Page, label: str, value: str, index: int = 0
+            self,
+            page: Page,
+            label: str,
+            value: str,
+            index: int = 0,
+            skip_combo: bool = False,
         ) -> None:
             """
             Fills the form field with the given value.
@@ -313,17 +319,21 @@ def user_fills_form_field(
             # We add a tiny delay here to prevent API complication and allow the modal to render
             page.wait_for_timeout(10)
 
+            modals = page.get_by_role("dialog")
+            locator = modals.first if modals.count() else page
+
             # Try a (custom) select
-            selects = page.get_by_role("combobox", name=label)
-            if selects.count():
-                select = selects.nth(index)
-                select.click()
-                option = select.get_by_text(value)
-                option.click()
-                return
+            if not skip_combo:
+                selects = locator.get_by_role("combobox", name=label)
+                if selects.count():
+                    select = selects.nth(index)
+                    select.click()
+                    option = select.get_by_text(value)
+                    option.click()
+                    return
 
             # Fill (native) input
-            inputs = page.get_by_label(label)
+            inputs = locator.get_by_label(label)
             input = inputs.nth(index)
             input.fill(value)
 

backend/src/openbeheer/zaaktype/tests/e2e/test_add_resultaattypen.py

@@ -59,6 +59,7 @@ def test_add_resultaattypen(page: Page, runner: GherkinRunner):
         "Selectielijstklasse",
         "1.1.2 - Ingericht - blijvend_bewaren - Gemeentewapen",
     )
+    _.when.user_fills_form_field(page, "Omschrijving", "Heraldiek", skip_combo=True)
     _.when.user_clicks_on_button(page, name="Doorgaan")
 
     # Add another
@@ -67,7 +68,9 @@ def test_add_resultaattypen(page: Page, runner: GherkinRunner):
         page,
         "Selectielijstklasse",
         "1.1.3 - Ingericht - vernietigen - P10Y - Wijziging inrichting BRP systeem",
-        1,
+    )
+    _.when.user_fills_form_field(
+        page, "Omschrijving", "Vernietiging Haal Centraal", skip_combo=True
     )
     _.when.user_clicks_on_button(page, name="Doorgaan")
 

backend/src/openbeheer/zaaktype/tests/e2e/test_errors.py

@@ -46,7 +46,7 @@ def test_errors(page: Page, runner: GherkinRunner):
     _.then.url_should_match(page, "editing=true")
 
     # Clear omschrijving
-    _.when.user_fills_form_field(page, "omschrijving", "", 0)
+    _.when.user_fills_form_field(page, "Omschrijving", "", 0)
 
     # Navigate to statustypen tab
     _.when.user_selects_tab(page, "Statustypen")
@@ -58,13 +58,13 @@ def test_errors(page: Page, runner: GherkinRunner):
     # Navigate to overzicht tab to check and fix error message
     _.when.user_selects_tab(page, "Overzicht (!)")
     _.then.page_should_contain_text(page, "Dit veld mag niet leeg zijn.")
-    _.when.user_fills_form_field(page, "omschrijving", "TEST OMSCHRIJVING", 0)
+    _.when.user_fills_form_field(page, "Omschrijving", "TEST OMSCHRIJVING", 0)
 
     # Navigate to statustypen tab to check and fix error message
     _.when.user_selects_tab(page, "Statustypen (!)")
     _.then.page_should_contain_text(page, "Dit veld mag niet leeg zijn.", None, 0)
     _.when.user_fills_form_field(
-        page, "omschrijving", "TEST STATUSTYPE OMSCHRIJVING", 2
+        page, "Omschrijving", "TEST STATUSTYPE OMSCHRIJVING", 2
     )
 
     # Save changes.