From cfedcac59e9a048fd74d46f740cb112c556ce5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0j=C3=B3n=20Gu=C3=B0j=C3=B3nsson?= Date: Tue, 24 Sep 2024 12:13:10 +0200 Subject: [PATCH] Updates e2e tests --- .../HearingArrangements/HearingArrangements.tsx | 3 +-- .../regression/custody-tests.spec.ts | 2 +- .../regression/indictment-tests.spec.ts | 15 ++++++++++----- .../regression/search-warrant-tests.spec.ts | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/HearingArrangements.tsx b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/HearingArrangements.tsx index d574cb3d8868..14f54d752318 100644 --- a/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/HearingArrangements.tsx +++ b/apps/judicial-system/web/src/routes/Prosecutor/RestrictionCase/HearingArrangements/HearingArrangements.tsx @@ -93,8 +93,7 @@ export const HearingArrangements = () => { [formatMessage, router, setWorkingCase, transitionCase, workingCase], ) - const stepIsValid = - isHearingArrangementsStepValidRC(workingCase) || isTransitioningCase + const stepIsValid = isHearingArrangementsStepValidRC(workingCase) return ( { .fill(randomPoliceCaseNumber()) await page.getByRole('button', { name: 'Skrá númer' }).click() await page.getByRole('checkbox').first().check() - await page.locator('input[name=accusedName]').fill(faker.name.findName()) + await page.locator('input[name=inputName]').fill(faker.name.findName()) await page.locator('input[name=accusedAddress]').fill('Einhversstaðar 1') await page.locator('#defendantGender').click() await page.locator('#react-select-defendantGender-option-0').click() diff --git a/apps/system-e2e/src/tests/judicial-system/regression/indictment-tests.spec.ts b/apps/system-e2e/src/tests/judicial-system/regression/indictment-tests.spec.ts index 032baf8fb428..b8b723faa91c 100644 --- a/apps/system-e2e/src/tests/judicial-system/regression/indictment-tests.spec.ts +++ b/apps/system-e2e/src/tests/judicial-system/regression/indictment-tests.spec.ts @@ -39,11 +39,11 @@ test.describe.serial('Indictment tests', () => { await page .getByRole('checkbox', { name: 'Ákærði er ekki með íslenska kennitölu' }) .check() - await page.getByTestId('nationalId').click() - await page.getByTestId('nationalId').fill('01.01.2000') - await page.getByTestId('accusedName').click() - await page.getByTestId('accusedName').fill(accusedName) - await page.getByTestId('accusedName').press('Tab') + await page.getByTestId('inputNationalId').click() + await page.getByTestId('inputNationalId').fill('01.01.2000') + await page.getByTestId('inputName').click() + await page.getByTestId('inputName').fill(accusedName) + await page.getByTestId('inputName').press('Tab') await page.getByTestId('accusedAddress').fill('Testgata 12') await page.locator('#defendantGender').click() await page.locator('#react-select-defendantGender-option-0').click() @@ -78,10 +78,15 @@ test.describe.serial('Indictment tests', () => { page.getByText('Játar sök').click(), verifyRequestCompletion(page, '/api/graphql', 'UpdateDefendant'), ]) + await Promise.all([ + page.getByText('Nei').last().click(), + verifyRequestCompletion(page, '/api/graphql', 'UpdateCase'), + ]) await Promise.all([ page.getByTestId('continueButton').click(), verifyRequestCompletion(page, '/api/graphql', 'Case'), ]) + // Case files await expect(page).toHaveURL(`/akaera/domskjol/${caseId}`) diff --git a/apps/system-e2e/src/tests/judicial-system/regression/search-warrant-tests.spec.ts b/apps/system-e2e/src/tests/judicial-system/regression/search-warrant-tests.spec.ts index 40fd809eac8f..64e139713d95 100644 --- a/apps/system-e2e/src/tests/judicial-system/regression/search-warrant-tests.spec.ts +++ b/apps/system-e2e/src/tests/judicial-system/regression/search-warrant-tests.spec.ts @@ -41,7 +41,7 @@ test.describe.serial('Search warrant tests', () => { await page.locator('#type').click() await page.locator('#react-select-type-option-0').click() await page.getByRole('checkbox').first().check() - await page.locator('input[name=accusedName]').fill(faker.name.findName()) + await page.locator('input[name=inputName]').fill(faker.name.findName()) await page.locator('input[name=accusedAddress]').fill('Einhversstaðar 1') await page.locator('#defendantGender').click() await page.locator('#react-select-defendantGender-option-0').click()