♻️ [#727] Refactor gherkin function to filter zaken

Author: SilviaAmAm

backend/src/openarchiefbeheer/destruction/tests/e2e/features/test_feature_list_create.py

@@ -138,7 +138,7 @@ def create_data():
                 "ZAAKTYPE-03 (ZAAKTYPE-03)"
             ])
 
-            await self.when.user_filters_zaken_on_text(page, "identificatie", "ZAAK-000")
+            await self.when.user_filters_zaken(page, "identificatie", "ZAAK-000")
             await self.then.path_should_be(page, "/destruction-lists/create?identificatie__icontains=ZAAK-000&page=1")
             await self.then.this_number_of_zaken_should_be_visible(page, 2)
             await self.then.zaaktype_filters_are(page, [
@@ -203,17 +203,17 @@ def create_data():
             await self.then.page_should_contain_text(page, "1.1.1 - Ingericht - blijvend_bewaren")
             await self.then.page_should_contain_text(page, "1.1.2 - Ingericht - blijvend_bewaren")
 
-            await self.when.user_filters_zaken_on_dropdown(page, "selectielijstklasse", "1.1 - Ingericht - vernietigen - P10Y")
+            await self.when.user_filters_zaken(page, "selectielijstklasse", "1.1 - Ingericht - vernietigen - P10Y")
 
             await self.then.this_number_of_zaken_should_be_visible(page, 1)
             await self.then.page_should_contain_text(page, "ZAAK-1")
 
-            await self.when.user_filters_zaken_on_dropdown(page, "selectielijstklasse", "1.1.1 - Ingericht - blijvend_bewaren")
+            await self.when.user_filters_zaken(page, "selectielijstklasse", "1.1.1 - Ingericht - blijvend_bewaren")
 
             await self.then.this_number_of_zaken_should_be_visible(page, 1)
             await self.then.page_should_contain_text(page, "ZAAK-2")
 
-            await self.when.user_filters_zaken_on_dropdown(page, "selectielijstklasse", "1.1.2 - Ingericht - blijvend_bewaren")
+            await self.when.user_filters_zaken(page, "selectielijstklasse", "1.1.2 - Ingericht - blijvend_bewaren")
 
             await self.then.this_number_of_zaken_should_be_visible(page, 1)
             await self.then.page_should_contain_text(page, "ZAAK-3")

backend/src/openarchiefbeheer/destruction/tests/e2e/features/test_feature_list_edit.py

@@ -181,7 +181,7 @@ def create_data():
                 "ZAAKTYPE-04 (ZAAKTYPE-04)",
             ])
             # If filtering first on identificatie, the zaaktype filters change
-            await self.when.user_filters_zaken_on_text(page, "identificatie", "ZAAK-000")
+            await self.when.user_filters_zaken(page, "identificatie", "ZAAK-000")
             await self.then.path_should_be(page, "/destruction-lists/00000000-0000-0000-0000-000000000000/edit?page=1&is_editing=true&identificatie__icontains=ZAAK-000")
             await self.then.this_number_of_zaken_should_be_visible(page, 2)
             await self.then.zaaktype_filters_are(page, [

backend/src/openarchiefbeheer/destruction/tests/e2e/features/test_feature_list_process_review.py

@@ -192,7 +192,7 @@ def create_data():
             await self.then.zaaktype_filters_are(page, ["ZAAKTYPE-01 (ZAAKTYPE-01)", "ZAAKTYPE-02 (ZAAKTYPE-02)"])
 
             # If filtering first on identificatie, the zaaktype filters change
-            await self.when.user_filters_zaken_on_text(page, "identificatie", "ZAAK-000")
+            await self.when.user_filters_zaken(page, "identificatie", "ZAAK-000")
             await self.then.path_should_be(page, "/destruction-lists/00000000-0000-0000-0000-000000000000/process-review?identificatie__icontains=ZAAK-000&page=1")
             await self.then.this_number_of_zaken_should_be_visible(page, 1)
             await self.then.zaaktype_filters_are(page, ["ZAAKTYPE-01 (ZAAKTYPE-01)"])

backend/src/openarchiefbeheer/destruction/tests/e2e/features/test_feature_list_review.py

@@ -277,7 +277,7 @@ def create_data():
             await self.then.zaaktype_filters_are(page, ["ZAAKTYPE-01 (ZAAKTYPE-01)", "ZAAKTYPE-02 (ZAAKTYPE-02)"])
 
             # If filtering first on identificatie, the zaaktype filters change
-            await self.when.user_filters_zaken_on_text(page, "identificatie", "ZAAK-000")
+            await self.when.user_filters_zaken(page, "identificatie", "ZAAK-000")
             await self.then.path_should_be(page, "/destruction-lists/00000000-0000-0000-0000-000000000000/review?identificatie__icontains=ZAAK-000&page=1")
             await self.then.this_number_of_zaken_should_be_visible(page, 1)
             await self.then.zaaktype_filters_are(page, [

backend/src/openarchiefbeheer/destruction/tests/e2e/features/test_feature_list_select_all.py

@@ -56,7 +56,7 @@ async def test_scenario_record_manager_creates_list_with_select_all_and_filters(
             await self.when.user_clicks_button(page, "Vernietigingslijst opstellen")
             await self.then.path_should_be(page, "/destruction-lists/create")
 
-            await self.when.user_filters_zaken_on_text(page, "omschrijving", "Test 1")
+            await self.when.user_filters_zaken(page, "omschrijving", "Test 1")
             await self.then.page_should_contain_text(page, "(de)selecteer 5 rijen")
 
             await self.when.user_clicks_checkbox(page, "(de)selecteer 1 pagina's", index=0)

backend/src/openarchiefbeheer/destruction/tests/e2e/issues/test_635_filters_reset.py

@@ -33,7 +33,7 @@ async def test_scenario_reset_button_works(self):
             await self.when.user_clicks_button(page, "Volgende")
             await self.then.url_should_contain_text(page, "page=2")
             await self.then.page_should_not_contain_text(page, "Filters wissen")
-            await self.when.user_filters_zaken_on_text(page, "omschrijving", "some text")
+            await self.when.user_filters_zaken(page, "omschrijving", "some text")
             await self.then.url_should_contain_text(page, "omschrijving__icontains=")
             await self.when.user_clicks_button(page, "Filters wissen")
             await self.then.input_field_should_be_empty(page, "Omschrijving")

backend/src/openarchiefbeheer/utils/tests/gherkin.py

@@ -622,22 +622,24 @@ async def user_fills_form_field(self, page, label, value, role=None, index=0):
             elements = await locator.all()
             await elements[index].fill(value)
 
-        async def user_filters_zaken_on_text(self, page, name, value):
-            locator = page.get_by_role("textbox", name=name)
-            await locator.fill(value)
+        async def user_filters_zaken(self, page, name, value):
+            locator = page.get_by_label(f'filter veld "{name}"')
+            # Check if it is a dropdown
+            element_role = await locator.get_attribute("role")
+            if element_role == "combobox":
+                await locator.click()
 
-        async def user_filters_zaken_on_dropdown(self, page, name, value):
-            select = page.get_by_label(f'filter veld "{name}"')
-            await select.click()
+                options = await page.query_selector_all(".mykn-option")
 
-            options = await page.query_selector_all(".mykn-option")
+                for option in options:
+                    text_content = await option.text_content()
+                    if not text_content == value:
+                        continue
 
-            for option in options:
-                text_content = await option.text_content()
-                if not text_content == value:
-                    continue
+                    return await option.click()
 
-                return await option.click()
+            # It's not a dropdown, it's a textbox then
+            return await locator.fill(value)
 
     class Then:
         """