Skip to content

Commit

Permalink
✏️ Fix use of 'list' word
Browse files Browse the repository at this point in the history
  • Loading branch information
SilviaAmAm committed Oct 15, 2024
1 parent d147b36 commit 411d1a5
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ async def test_scenario_record_manager_finalizes_list(self):
await self.given.assignee_exists(user=reviewer, role=ListRole.reviewer),
]

list = await self.given.list_exists(
destruction_list = await self.given.list_exists(
assignee=record_manager,
assignees=assignees,
uuid="00000000-0000-0000-0000-000000000000",
Expand All @@ -32,7 +32,7 @@ async def test_scenario_record_manager_finalizes_list(self):
)

# Reviewer provided a review.
await self.given.review_exists(author=reviewer, destruction_list=list, decision=ReviewDecisionChoices.accepted)
await self.given.review_exists(author=reviewer, destruction_list=destruction_list, decision=ReviewDecisionChoices.accepted)

await self.when.record_manager_logs_in(page)
await self.then.path_should_be(page, "/destruction-lists")
Expand All @@ -47,4 +47,4 @@ async def test_scenario_record_manager_finalizes_list(self):

await self.then.path_should_be(page, "/destruction-lists")
await self.then.page_should_contain_text(page, "Destruction list to finalize")
await self.then.list_should_have_status(page, list, ListStatus.ready_for_archivist)
await self.then.list_should_have_status(page, destruction_list, ListStatus.ready_for_archivist)
Original file line number Diff line number Diff line change
Expand Up @@ -177,19 +177,19 @@ def create_data():
record_manager = UserFactory.create(username="Record Manager", password="ANic3Password", post__can_start_destruction=True)

zaken = ZaakFactory.create_batch(2)
list = DestructionListFactory.create(
destruction_list = DestructionListFactory.create(
author=record_manager,
assignee=record_manager,
status=ListStatus.changes_requested,
uuid="00000000-0000-0000-0000-000000000000",
name="Destruction list to process",
)
item1 = DestructionListItemFactory.create(destruction_list=list, zaak=zaken[0])
item2 = DestructionListItemFactory.create(destruction_list=list, zaak=zaken[1])
item1 = DestructionListItemFactory.create(destruction_list=destruction_list, zaak=zaken[0])
item2 = DestructionListItemFactory.create(destruction_list=destruction_list, zaak=zaken[1])

review = DestructionListReviewFactory.create(destruction_list=list, decision=ReviewDecisionChoices.rejected)
DestructionListItemReviewFactory.create(destruction_list=list, destruction_list_item=item1, review=review)
DestructionListItemReviewFactory.create(destruction_list=list, destruction_list_item=item2, review=review)
review = DestructionListReviewFactory.create(destruction_list=destruction_list, decision=ReviewDecisionChoices.rejected)
DestructionListItemReviewFactory.create(destruction_list=destruction_list, destruction_list_item=item1, review=review)
DestructionListItemReviewFactory.create(destruction_list=destruction_list, destruction_list_item=item2, review=review)

# Simulate the zaak being deleted by *something else*
item1.zaak.delete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ async def test_scenario_reviewer_approves_list(self):
await self.given.assignee_exists(user=archivist, role=ListRole.archivist),
]

list = await self.given.list_exists(
destruction_list = await self.given.list_exists(
assignee=reviewer,
assignees=assignees,
uuid="00000000-0000-0000-0000-000000000000",
Expand All @@ -55,7 +55,7 @@ async def test_scenario_reviewer_approves_list(self):

await self.then.path_should_be(page, "/destruction-lists")
await self.then.page_should_contain_text(page, "Destruction list to review")
await self.then.list_should_have_status(page, list, ListStatus.internally_reviewed)
await self.then.list_should_have_status(page, destruction_list, ListStatus.internally_reviewed)

async def test_scenario_reviewer_rejects_list(self):
async with browser_page() as page:
Expand All @@ -69,7 +69,7 @@ async def test_scenario_reviewer_rejects_list(self):
await self.given.assignee_exists(user=archivist, role=ListRole.archivist),
]

list = await self.given.list_exists(
destruction_list = await self.given.list_exists(
assignee=reviewer,
assignees=assignees,
uuid="00000000-0000-0000-0000-000000000000",
Expand All @@ -91,7 +91,7 @@ async def test_scenario_reviewer_rejects_list(self):

await self.then.path_should_be(page, "/destruction-lists")
await self.then.page_should_contain_text(page, "Destruction list to review")
await self.then.list_should_have_status(page, list, ListStatus.changes_requested)
await self.then.list_should_have_status(page, destruction_list, ListStatus.changes_requested)

@tag("gh-372")
async def test_scenario_reviewer_reviews_second_time(self):
Expand All @@ -102,18 +102,18 @@ def create_data():

zaken = ZaakFactory.create_batch(2)

list = DestructionListFactory.create(
destruction_list = DestructionListFactory.create(
author=record_manager,
assignee=reviewer,
status=ListStatus.ready_to_review,
uuid="00000000-0000-0000-0000-000000000000",
name="Destruction list to review",
)
item = DestructionListItemFactory.create(destruction_list=list, zaak=zaken[0])
DestructionListItemFactory.create(destruction_list=list, zaak=zaken[1])
item = DestructionListItemFactory.create(destruction_list=destruction_list, zaak=zaken[0])
DestructionListItemFactory.create(destruction_list=destruction_list, zaak=zaken[1])

review = DestructionListReviewFactory.create(destruction_list=list, author=reviewer, decision=ReviewDecisionChoices.rejected)
DestructionListItemReviewFactory.create(destruction_list=list, destruction_list_item=item, review=review)
review = DestructionListReviewFactory.create(destruction_list=destruction_list, author=reviewer, decision=ReviewDecisionChoices.rejected)
DestructionListItemReviewFactory.create(destruction_list=destruction_list, destruction_list_item=item, review=review)

async with browser_page() as page:
await self.given.data_exists(create_data)
Expand All @@ -135,7 +135,7 @@ async def test_scenario_archivist_approves_list(self):
await self.given.assignee_exists(user=archivist, role=ListRole.archivist),
]

list = await self.given.list_exists(
destruction_list = await self.given.list_exists(
assignee=archivist,
assignees=assignees,
uuid="00000000-0000-0000-0000-000000000000",
Expand All @@ -155,7 +155,7 @@ async def test_scenario_archivist_approves_list(self):

await self.then.path_should_be(page, "/destruction-lists")
await self.then.page_should_contain_text(page, "Destruction list to review")
await self.then.list_should_have_status(page, list, ListStatus.ready_to_delete)
await self.then.list_should_have_status(page, destruction_list, ListStatus.ready_to_delete)

async def test_scenario_archivist_rejects_list(self):
async with browser_page() as page:
Expand All @@ -167,7 +167,7 @@ async def test_scenario_archivist_rejects_list(self):
await self.given.assignee_exists(user=archivist, role=ListRole.archivist),
]

list = await self.given.list_exists(
destruction_list = await self.given.list_exists(
assignee=archivist,
assignees=assignees,
uuid="00000000-0000-0000-0000-000000000000",
Expand All @@ -189,7 +189,7 @@ async def test_scenario_archivist_rejects_list(self):

await self.then.path_should_be(page, "/destruction-lists")
await self.then.page_should_contain_text(page, "Destruction list to review")
await self.then.list_should_have_status(page, list, ListStatus.changes_requested)
await self.then.list_should_have_status(page, destruction_list, ListStatus.changes_requested)

async def test_zaaktype_filters(self):
@sync_to_async
Expand Down Expand Up @@ -279,19 +279,19 @@ def create_data():
reviewer = UserFactory.create(username="Beoordelaar", password="ANic3Password", post__can_review_destruction=True)

zaken = ZaakFactory.create_batch(2)
list = DestructionListFactory.create(
destruction_list = DestructionListFactory.create(
author=record_manager,
assignee=reviewer,
status=ListStatus.ready_to_review,
uuid="00000000-0000-0000-0000-000000000000",
name="Destruction list to review",
)
item1 = DestructionListItemFactory.create(destruction_list=list, zaak=zaken[0])
item2 = DestructionListItemFactory.create(destruction_list=list, zaak=zaken[1])
item1 = DestructionListItemFactory.create(destruction_list=destruction_list, zaak=zaken[0])
item2 = DestructionListItemFactory.create(destruction_list=destruction_list, zaak=zaken[1])

review = DestructionListReviewFactory.create(destruction_list=list, decision=ReviewDecisionChoices.rejected)
DestructionListItemReviewFactory.create(destruction_list=list, destruction_list_item=item1, review=review)
DestructionListItemReviewFactory.create(destruction_list=list, destruction_list_item=item2, review=review)
review = DestructionListReviewFactory.create(destruction_list=destruction_list, decision=ReviewDecisionChoices.rejected)
DestructionListItemReviewFactory.create(destruction_list=destruction_list, destruction_list_item=item1, review=review)
DestructionListItemReviewFactory.create(destruction_list=destruction_list, destruction_list_item=item2, review=review)

# Simulate the zaak being deleted by *something else*
item1.zaak.delete()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ async def test_scenario_record_manager_creates_list_with_select_all(self):
await self.then.path_should_be(page, "/destruction-lists")
await self.then.page_should_contain_text(page, "Destruction list select all")

list = await get_list("Destruction list select all")
destruction_list = await get_list("Destruction list select all")

await self.then.list_should_have_number_of_items(list, 200)
await self.then.list_should_have_number_of_items(destruction_list, 200)

async def test_scenario_record_manager_creates_list_with_select_all_and_filters(self):
async with browser_page() as page:
Expand Down Expand Up @@ -67,6 +67,6 @@ async def test_scenario_record_manager_creates_list_with_select_all_and_filters(
await self.then.path_should_be(page, "/destruction-lists")
await self.then.page_should_contain_text(page, "Destruction list select all with filters")

list = await get_list("Destruction list select all with filters")
destruction_list = await get_list("Destruction list select all with filters")

await self.then.list_should_have_number_of_items(list, 5)
await self.then.list_should_have_number_of_items(destruction_list, 5)
8 changes: 5 additions & 3 deletions backend/src/openarchiefbeheer/zaken/tests/test_viewsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,17 @@ def test_filter_zaken_with_removed_zaken(self):
status=ListItemStatus.suggested,
processing_status=InternalStatus.succeeded,
)
list = DestructionListFactory.create()
destruction_list = DestructionListFactory.create()
for zaak in zaken_in_list:
DestructionListItemFactory.create(destruction_list=list, zaak=zaak)
DestructionListItemFactory.create(
destruction_list=destruction_list, zaak=zaak
)

user = UserFactory(username="record_manager", post__can_start_destruction=True)

self.client.force_authenticate(user)
endpoint = furl(reverse("api:zaken-list"))
endpoint.args["not_in_destruction_list_except"] = str(list.uuid)
endpoint.args["not_in_destruction_list_except"] = str(destruction_list.uuid)
response = self.client.get(endpoint.url)
data = response.json()

Expand Down

0 comments on commit 411d1a5

Please sign in to comment.