✅ #448 - test: attempt to make the tests less flaky

Author: svenvandescheur

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

@@ -90,10 +90,12 @@ def create_data():
                 username="record_manager", password="ANic3Password", post__can_start_destruction=True
             )
             destruction_list = DestructionListFactory.create(
+                name="Destruction list to filter",
                 assignee=record_manager,
                 author=record_manager,
                 uuid="00000000-0000-0000-0000-000000000000",
                 status=ListStatus.new
+
             )
             zaak1 = ZaakFactory.create(
                 identificatie="ZAAK-000-1",

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

@@ -11,6 +11,7 @@
 class Issue446ConfirmRemoveExclusion(GherkinLikeTestCase):
     async def test_scenario_user_approves_and_deselects_single_item(self):
         async with browser_page() as page:
+            await self.given.zaak_selection_api_is_empty()
             zaken = await self.given.zaken_are_indexed(3)
             reviewer = await self.given.reviewer_exists()
 
@@ -38,6 +39,7 @@ async def test_scenario_user_approves_and_deselects_single_item(self):
 
     async def test_scenario_user_approves_and_deselects_all_items_individually(self):
         async with browser_page() as page:
+            await self.given.zaak_selection_api_is_empty()
             zaken = await self.given.zaken_are_indexed(3)
             reviewer = await self.given.reviewer_exists()
 
@@ -83,6 +85,7 @@ async def test_scenario_user_approves_and_deselects_all_items_individually(self)
 
     async def test_scenario_user_excludes_and_deselects_single_item(self):
         async with browser_page() as page:
+            await self.given.zaak_selection_api_is_empty()
             zaken = await self.given.zaken_are_indexed(3)
             reviewer = await self.given.reviewer_exists()
 
@@ -118,6 +121,7 @@ async def test_scenario_user_excludes_and_deselects_single_item(self):
 
     async def test_scenario_user_excludes_and_keeps_single_item(self):
         async with browser_page() as page:
+            await self.given.zaak_selection_api_is_empty()
             zaken = await self.given.zaken_are_indexed(3)
             reviewer = await self.given.reviewer_exists()
 
@@ -153,6 +157,7 @@ async def test_scenario_user_excludes_and_keeps_single_item(self):
 
     async def test_scenario_user_approves_and_deselects_all_items_in_batch(self):
         async with browser_page() as page:
+            await self.given.zaak_selection_api_is_empty()
             zaken = await self.given.zaken_are_indexed(3)
             reviewer = await self.given.reviewer_exists()
 
@@ -181,6 +186,7 @@ async def test_scenario_user_approves_and_deselects_all_items_in_batch(self):
 
     async def test_scenario_user_approves_items_hybrid(self):
         async with browser_page() as page:
+            await self.given.zaak_selection_api_is_empty()
             zaken = await self.given.zaken_are_indexed(3)
             reviewer = await self.given.reviewer_exists()
 
@@ -211,6 +217,7 @@ async def test_scenario_user_approves_items_hybrid(self):
 
     async def test_scenario_user_approves_and_deselect_unexcluded_items_in_batch(self):
         async with browser_page() as page:
+            await self.given.zaak_selection_api_is_empty()
             zaken = await self.given.zaken_are_indexed(3)
             reviewer = await self.given.reviewer_exists()
 

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

@@ -13,6 +13,7 @@
     DestructionListItemReviewFactory,
     DestructionListReviewFactory,
 )
+from openarchiefbeheer.selection.models import AllSelectedToggle, SelectionItem
 from openarchiefbeheer.utils.tests.e2e import PlaywrightTestCase
 from openarchiefbeheer.zaken.tests.factories import ZaakFactory
 
@@ -247,6 +248,10 @@ async def handle(route):
         async def zaken_are_indexed(self, amount, **kwargs):
             return await self._get_or_create_batch(ZaakFactory, amount, **kwargs)
 
+        async def zaak_selection_api_is_empty(self):
+            await SelectionItem.objects.all().adelete()
+            await AllSelectedToggle.objects.all().adelete()
+
         @sync_to_async
         def _orm_get(self, model, **kwargs):
             return model.objects.get(**kwargs)
@@ -363,11 +368,8 @@ async def archivist_logs_in(self, page, **kwargs):
             )
 
         async def _user_logs_in(self, page, username, password="ANic3Password"):
-            await page.goto(self.testcase.live_server_url)
-            await page.wait_for_url(
-                f"{self.testcase.live_server_url}/login?next=/destruction-lists"
-            )
-
+            await self.user_logs_out(page)
+            await page.goto(f"{self.testcase.live_server_url}/login")
             await page.get_by_label("Gebruikersnaam").fill(username)
             await page.get_by_label("Wachtwoord").fill(password)
             await page.get_by_role("button", name="Inloggen").click()
@@ -525,7 +527,9 @@ async def zaak_should_be_selected(
             locator = page.get_by_role("row", name=identificatie).get_by_label(
                 template.format(identificatie=identificatie)
             )
-            await expect(locator).to_be_checked()
+            await expect(locator).to_be_checked(
+                timeout=10000
+            )  # Attempt to fix flakiness?
 
         async def zaak_should_not_be_selected(
             self, page, identificatie, template="(de)selecteer rij"