Skip to content

Commit 05e146b

Browse files
committed
🚚 Rename gherkin function
1 parent 9dcefb5 commit 05e146b

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def create_data():
192192
await self.then.zaaktype_filters_are(page, ["ZAAKTYPE-01 (ZAAKTYPE-01)", "ZAAKTYPE-02 (ZAAKTYPE-02)"])
193193

194194
# If filtering first on identificatie, the zaaktype filters change
195-
await self.when.user_filters_zaken(page, "identificatie", "ZAAK-000")
195+
await self.when.user_filters_zaken_on_text(page, "identificatie", "ZAAK-000")
196196
await self.then.path_should_be(page, "/destruction-lists/00000000-0000-0000-0000-000000000000/process-review?identificatie__icontains=ZAAK-000&page=1")
197197
await self.then.this_number_of_zaken_should_be_visible(page, 1)
198198
await self.then.zaaktype_filters_are(page, ["ZAAKTYPE-01 (ZAAKTYPE-01)"])

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def create_data():
277277
await self.then.zaaktype_filters_are(page, ["ZAAKTYPE-01 (ZAAKTYPE-01)", "ZAAKTYPE-02 (ZAAKTYPE-02)"])
278278

279279
# If filtering first on identificatie, the zaaktype filters change
280-
await self.when.user_filters_zaken(page, "identificatie", "ZAAK-000")
280+
await self.when.user_filters_zaken_on_text(page, "identificatie", "ZAAK-000")
281281
await self.then.path_should_be(page, "/destruction-lists/00000000-0000-0000-0000-000000000000/review?identificatie__icontains=ZAAK-000&page=1")
282282
await self.then.this_number_of_zaken_should_be_visible(page, 1)
283283
await self.then.zaaktype_filters_are(page, [

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ async def test_scenario_record_manager_creates_list_with_select_all_and_filters(
5656
await self.when.user_clicks_button(page, "Vernietigingslijst opstellen")
5757
await self.then.path_should_be(page, "/destruction-lists/create")
5858

59-
await self.when.user_filters_zaken(page, "omschrijving", "Test 1")
59+
await self.when.user_filters_zaken_on_text(page, "omschrijving", "Test 1")
6060
await self.then.page_should_contain_text(page, "(de)selecteer 5 rijen")
6161

6262
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ async def test_scenario_reset_button_works(self):
3333
await self.when.user_clicks_button(page, "Volgende")
3434
await self.then.url_should_contain_text(page, "page=2")
3535
await self.then.page_should_not_contain_text(page, "Filters wissen")
36-
await self.when.user_filters_zaken(page, "omschrijving", "some text")
36+
await self.when.user_filters_zaken_on_text(page, "omschrijving", "some text")
3737
await self.then.url_should_contain_text(page, "omschrijving__icontains=")
3838
await self.when.user_clicks_button(page, "Filters wissen")
3939
await self.then.input_field_should_be_empty(page, "Omschrijving")

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

+16-4
Original file line numberDiff line numberDiff line change
@@ -619,10 +619,23 @@ async def user_fills_form_field(self, page, label, value, role=None, index=0):
619619
elements = await locator.all()
620620
await elements[index].fill(value)
621621

622-
async def user_filters_zaken(self, page, name, value):
622+
async def user_filters_zaken_on_text(self, page, name, value):
623623
locator = page.get_by_role("textbox", name=name)
624624
await locator.fill(value)
625625

626+
async def user_filters_zaken_on_dropdown(self, page, name, value):
627+
select = page.get_by_label(f'filter veld "{name}"')
628+
await select.click()
629+
630+
options = await page.query_selector_all(".mykn-option")
631+
632+
for option in options:
633+
text_content = await option.text_content()
634+
if not text_content == value:
635+
continue
636+
637+
return await option.click()
638+
626639
class Then:
627640
"""
628641
The "Then" steps specify the expected outcomes or results.
@@ -829,10 +842,9 @@ async def zaaktype_filters_are(self, page, expected_filters):
829842
self.testcase.assertEqual(labels, expected_filters)
830843

831844
async def this_number_of_zaken_should_be_visible(self, page, number):
832-
locator = page.get_by_role("grid")
833-
rows = await locator.locator("tbody").locator("tr").all()
845+
locator = page.get_by_role("grid").locator("tbody").locator("tr")
834846

835-
self.testcase.assertEqual(len(rows), number)
847+
await expect(locator).to_have_count(number)
836848

837849
async def input_field_should_be_empty(self, page, placeholder):
838850
locator = page.get_by_placeholder(placeholder)

0 commit comments

Comments
 (0)