Skip to content

Commit 8295850

Browse files
nicki-nhsnicki-nhs
committed
CCM-11544 Fix tests
1 parent 9ef13cb commit 8295850

File tree

2 files changed

+64
-40
lines changed

2 files changed

+64
-40
lines changed

‎tests/test-team/template-mgmt-routing-component-tests/letter/choose-large-print-letter-template.routing-component.spec.ts‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@ test.describe('Routing - Choose large print letter template page', () => {
151151

152152
test('common page tests', async ({ page, baseURL }) => {
153153
const props = {
154-
page: new RoutingChooseLargePrintLetterTemplatePage(page),
154+
page: new RoutingChooseLargePrintLetterTemplatePage(page)
155+
.setPathParam('messagePlanId', routingConfigIds.valid)
156+
.setSearchParam('lockNumber', String(routingConfigs.valid.lockNumber)),
155157
id: routingConfigIds.valid,
156158
baseURL,
157159
};
@@ -233,6 +235,7 @@ test.describe('Routing - Choose large print letter template page', () => {
233235
new RoutingChooseLargePrintLetterTemplatePage(page);
234236
await chooseLargePrintLetterTemplatePage
235237
.setPathParam('messagePlanId', routingConfigs.valid.id)
238+
.setSearchParam('lockNumber', String(routingConfigs.valid.lockNumber))
236239
.loadPage();
237240

238241
await chooseLargePrintLetterTemplatePage
@@ -262,6 +265,7 @@ test.describe('Routing - Choose large print letter template page', () => {
262265
new RoutingChooseLargePrintLetterTemplatePage(page);
263266
await chooseLargePrintLetterTemplatePage
264267
.setPathParam('messagePlanId', routingConfigs.valid.id)
268+
.setSearchParam('lockNumber', String(routingConfigs.valid.lockNumber))
265269
.loadPage();
266270

267271
await chooseLargePrintLetterTemplatePage.saveAndContinueButton.click();
@@ -303,6 +307,10 @@ test.describe('Routing - Choose large print letter template page', () => {
303307
new RoutingChooseLargePrintLetterTemplatePage(page);
304308
await chooseLargePrintLetterTemplatePage
305309
.setPathParam('messagePlanId', routingConfigs.withLargePrintSelected.id)
310+
.setSearchParam(
311+
'lockNumber',
312+
String(routingConfigs.withLargePrintSelected.lockNumber)
313+
)
306314
.loadPage();
307315

308316
await assertChooseTemplatePageWithPreviousSelection({
@@ -356,6 +364,7 @@ test.describe('Routing - Choose large print letter template page', () => {
356364

357365
await chooseLargePrintLetterTemplatePage
358366
.setPathParam('messagePlanId', routingConfigIds.notFound)
367+
.setSearchParam('lockNumber', '1')
359368
.loadPage();
360369

361370
await expect(page).toHaveURL(
@@ -369,6 +378,7 @@ test.describe('Routing - Choose large print letter template page', () => {
369378

370379
await chooseLargePrintLetterTemplatePage
371380
.setPathParam('messagePlanId', routingConfigIds.invalid)
381+
.setSearchParam('lockNumber', '1')
372382
.loadPage();
373383

374384
await expect(page).toHaveURL(
@@ -385,6 +395,10 @@ test.describe('Routing - Choose large print letter template page', () => {
385395

386396
await chooseLargePrintLetterTemplatePage
387397
.setPathParam('messagePlanId', routingConfigs.nonLetter.id)
398+
.setSearchParam(
399+
'lockNumber',
400+
String(routingConfigs.nonLetter.lockNumber)
401+
)
388402
.loadPage();
389403

390404
await expect(page).toHaveURL(

‎tests/test-team/template-mgmt-routing-component-tests/letter/choose-other-language-letter-template.routing-component.spec.ts‎

Lines changed: 49 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,9 @@ test.describe('Routing - Choose other language letter templates page', () => {
209209

210210
test('common page tests', async ({ page, baseURL }) => {
211211
const props = {
212-
page: new RoutingChooseOtherLanguageLetterTemplatePage(page).setPathParam(
213-
'messagePlanId',
214-
routingConfigIds.valid
215-
),
212+
page: new RoutingChooseOtherLanguageLetterTemplatePage(page)
213+
.setPathParam('messagePlanId', routingConfigIds.valid)
214+
.setSearchParam('lockNumber', String(routingConfigs.valid.lockNumber)),
216215
id: routingConfigIds.valid,
217216
baseURL,
218217
};
@@ -222,7 +221,7 @@ test.describe('Routing - Choose other language letter templates page', () => {
222221
await assertSignOutLink(props);
223222
await assertBackLinkBottom({
224223
...props,
225-
expectedUrl: `/message-plans/choose-templates/${routingConfigIds.valid}`,
224+
expectedUrl: `templates/message-plans/choose-templates/${routingConfigIds.valid}`,
226225
});
227226
});
228227

@@ -241,7 +240,7 @@ test.describe('Routing - Choose other language letter templates page', () => {
241240
});
242241

243242
await expect(page).toHaveURL(
244-
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.valid.id}`
243+
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.valid.id}?lockNumber=${routingConfigs.valid.lockNumber}`
245244
);
246245

247246
await expect(
@@ -323,6 +322,10 @@ test.describe('Routing - Choose other language letter templates page', () => {
323322
new RoutingChooseOtherLanguageLetterTemplatePage(page);
324323
await chooseOtherLanguageLetterTemplatePage
325324
.setPathParam('messagePlanId', routingConfigForUserWithNoTemplates.id)
325+
.setSearchParam(
326+
'lockNumber',
327+
String(routingConfigForUserWithNoTemplates.lockNumber)
328+
)
326329
.loadPage();
327330

328331
await assertChooseTemplatePageWithNoTemplates({
@@ -354,6 +357,7 @@ test.describe('Routing - Choose other language letter templates page', () => {
354357

355358
await chooseOtherLanguageLetterTemplatePage
356359
.setPathParam('messagePlanId', routingConfigs.valid.id)
360+
.setSearchParam('lockNumber', String(routingConfigs.valid.lockNumber))
357361
.loadPage();
358362

359363
await chooseOtherLanguageLetterTemplatePage
@@ -370,15 +374,13 @@ test.describe('Routing - Choose other language letter templates page', () => {
370374

371375
const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
372376

373-
const languageTemplateSection =
377+
const templateNames =
374378
chooseTemplatesPage.alternativeLetterFormats().otherLanguages
375379
.templateNames;
376-
await expect(languageTemplateSection).toContainText(
377-
templates.FRENCH_LETTER.name
378-
);
379-
await expect(languageTemplateSection).toContainText(
380-
templates.SPANISH_LETTER.name
381-
);
380+
const templateTexts = await templateNames.allTextContents();
381+
expect(templateTexts.length).toBe(2);
382+
expect(templateTexts).toContain(templates.FRENCH_LETTER.name);
383+
expect(templateTexts).toContain(templates.SPANISH_LETTER.name);
382384
});
383385

384386
test('user can add language templates to a message plan that has an accessible format template', async ({
@@ -392,10 +394,14 @@ test.describe('Routing - Choose other language letter templates page', () => {
392394
'messagePlanId',
393395
routingConfigs.withAccessibleTemplateSelected.id
394396
)
397+
.setSearchParam(
398+
'lockNumber',
399+
String(routingConfigs.withAccessibleTemplateSelected.lockNumber)
400+
)
395401
.loadPage();
396402

397403
await expect(page).toHaveURL(
398-
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.withAccessibleTemplateSelected.id}`
404+
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.withAccessibleTemplateSelected.id}?lockNumber=${routingConfigs.withAccessibleTemplateSelected.lockNumber}`
399405
);
400406

401407
await expect(
@@ -423,15 +429,13 @@ test.describe('Routing - Choose other language letter templates page', () => {
423429
)
424430
.loadPage();
425431

426-
const languageTemplateSection =
427-
chooseTemplatesPage.alternativeLetterFormats().otherLanguages
428-
.templateNames;
429-
await expect(languageTemplateSection).toContainText(
430-
templates.FRENCH_LETTER.name
431-
);
432-
await expect(languageTemplateSection).toContainText(
433-
templates.POLISH_LETTER.name
434-
);
432+
const otherLanguagesItem =
433+
chooseTemplatesPage.alternativeLetterFormats().otherLanguages;
434+
const templateNames = otherLanguagesItem.templateNames;
435+
const templateTexts = await templateNames.allTextContents();
436+
expect(templateTexts.length).toBe(2);
437+
expect(templateTexts).toContain(templates.FRENCH_LETTER.name);
438+
expect(templateTexts).toContain(templates.POLISH_LETTER.name);
435439

436440
const largePrintSection =
437441
chooseTemplatesPage.alternativeLetterFormats().largePrint.templateName;
@@ -451,10 +455,14 @@ test.describe('Routing - Choose other language letter templates page', () => {
451455
'messagePlanId',
452456
routingConfigs.withLanguageTemplatesSelected.id
453457
)
458+
.setSearchParam(
459+
'lockNumber',
460+
String(routingConfigs.withLanguageTemplatesSelected.lockNumber)
461+
)
454462
.loadPage();
455463

456464
await expect(page).toHaveURL(
457-
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.withLanguageTemplatesSelected.id}`
465+
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.withLanguageTemplatesSelected.id}?lockNumber=${routingConfigs.withLanguageTemplatesSelected.lockNumber}`
458466
);
459467

460468
const previouslySelected =
@@ -500,18 +508,13 @@ test.describe('Routing - Choose other language letter templates page', () => {
500508
)
501509
.loadPage();
502510

503-
const languageTemplateSection =
504-
chooseTemplatesPage.alternativeLetterFormats().otherLanguages
505-
.templateNames;
506-
await expect(languageTemplateSection).toContainText(
507-
templates.FRENCH_LETTER.name
508-
);
509-
await expect(languageTemplateSection).toContainText(
510-
templates.SPANISH_LETTER.name
511-
);
512-
await expect(languageTemplateSection).not.toContainText(
513-
templates.POLISH_LETTER.name
514-
);
511+
const otherLanguagesItem =
512+
chooseTemplatesPage.alternativeLetterFormats().otherLanguages;
513+
const templateNames = otherLanguagesItem.templateNames;
514+
const templateTexts = await templateNames.allTextContents();
515+
expect(templateTexts.length).toBe(2);
516+
expect(templateTexts).toContain(templates.FRENCH_LETTER.name);
517+
expect(templateTexts).toContain(templates.SPANISH_LETTER.name);
515518
});
516519

517520
test('user must select at least one template, without duplicate languages - errors update correctly when switching between states', async ({
@@ -522,12 +525,13 @@ test.describe('Routing - Choose other language letter templates page', () => {
522525
new RoutingChooseOtherLanguageLetterTemplatePage(page);
523526
await chooseOtherLanguageLetterTemplatePage
524527
.setPathParam('messagePlanId', routingConfigs.valid.id)
528+
.setSearchParam('lockNumber', String(routingConfigs.valid.lockNumber))
525529
.loadPage();
526530

527531
await chooseOtherLanguageLetterTemplatePage.saveAndContinueButton.click();
528532

529533
await expect(page).toHaveURL(
530-
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.valid.id}`
534+
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.valid.id}?lockNumber=${routingConfigs.valid.lockNumber}`
531535
);
532536

533537
await expect(
@@ -554,7 +558,7 @@ test.describe('Routing - Choose other language letter templates page', () => {
554558
await chooseOtherLanguageLetterTemplatePage.saveAndContinueButton.click();
555559

556560
await expect(page).toHaveURL(
557-
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.valid.id}`
561+
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.valid.id}?lockNumber=${routingConfigs.valid.lockNumber}`
558562
);
559563

560564
await expect(
@@ -584,7 +588,7 @@ test.describe('Routing - Choose other language letter templates page', () => {
584588
await chooseOtherLanguageLetterTemplatePage.saveAndContinueButton.click();
585589

586590
await expect(page).toHaveURL(
587-
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.valid.id}`
591+
`${baseURL}/templates/message-plans/choose-other-language-letter-template/${routingConfigs.valid.id}?lockNumber=${routingConfigs.valid.lockNumber}`
588592
);
589593

590594
await expect(
@@ -619,6 +623,7 @@ test.describe('Routing - Choose other language letter templates page', () => {
619623

620624
await chooseOtherLanguageLetterTemplatePage
621625
.setPathParam('messagePlanId', routingConfigIds.notFound)
626+
.setSearchParam('lockNumber', '1')
622627
.loadPage();
623628

624629
await expect(page).toHaveURL(
@@ -632,6 +637,7 @@ test.describe('Routing - Choose other language letter templates page', () => {
632637

633638
await chooseOtherLanguageLetterTemplatePage
634639
.setPathParam('messagePlanId', routingConfigIds.invalid)
640+
.setSearchParam('lockNumber', '1')
635641
.loadPage();
636642

637643
await expect(page).toHaveURL(
@@ -648,6 +654,10 @@ test.describe('Routing - Choose other language letter templates page', () => {
648654

649655
await chooseOtherLanguageLetterTemplatePage
650656
.setPathParam('messagePlanId', routingConfigs.nonLetter.id)
657+
.setSearchParam(
658+
'lockNumber',
659+
String(routingConfigs.nonLetter.lockNumber)
660+
)
651661
.loadPage();
652662

653663
await expect(page).toHaveURL(

0 commit comments

Comments
 (0)