Skip to content

Commit 3a1d656

Browse files
author
Fawad Ali
committed
CCM-5756: fix component tests for button remane
1 parent f8fcfb7 commit 3a1d656

8 files changed

+31
-37
lines changed

‎tests/test-team/pages/template-mgmt-base-page.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class TemplateMgmtBasePage {
1717

1818
readonly errorSummaryList: Locator;
1919

20-
readonly continueButton: Locator;
20+
readonly submitButton: Locator;
2121

2222
readonly skipLink: Locator;
2323

@@ -48,10 +48,8 @@ export class TemplateMgmtBasePage {
4848

4949
this.errorSummaryList = this.errorSummary.getByRole('listitem');
5050

51-
this.continueButton = page
52-
.locator('[class="nhsuk-button"]')
53-
.and(page.getByRole('button'))
54-
.and(page.getByText('Continue'));
51+
this.submitButton = page
52+
.locator('button.nhsuk-button[type="submit"]');
5553

5654
this.skipLink = page
5755
.locator('[id="skip-link"]')
@@ -70,8 +68,8 @@ export class TemplateMgmtBasePage {
7068
await this.loginLink.click();
7169
}
7270

73-
async clickContinueButton() {
74-
await this.continueButton.click();
71+
async clickSubmitButton() {
72+
await this.submitButton.click();
7573
}
7674

7775
async loadPage(_: string) {

‎tests/test-team/template-mgmt-component-tests/email/template-mgmt-create-email-page.component.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ test.describe('Create Email message template Page', () => {
197197
'This is an email message'
198198
);
199199

200-
await createEmailTemplatePage.clickContinueButton();
200+
await createEmailTemplatePage.clickSubmitButton();
201201

202202
await expect(page).toHaveURL(
203203
`${baseURL}/templates/preview-email-template/${sessions.submit.id}`
@@ -221,9 +221,7 @@ test.describe('Create Email message template Page', () => {
221221

222222
await createEmailTemplatePage.messageTextArea.fill(templateMessage);
223223

224-
await createEmailTemplatePage.clickContinueButton();
225-
226-
await page.getByRole('button', { name: 'Continue' }).click();
224+
await createEmailTemplatePage.clickSubmitButton();
227225

228226
await expect(createEmailTemplatePage.nameInput).toHaveValue(templateName);
229227

@@ -267,7 +265,7 @@ test.describe('Create Email message template Page', () => {
267265

268266
await createEmailTemplatePage.loadPage(sessions.empty.id);
269267

270-
await createEmailTemplatePage.clickContinueButton();
268+
await createEmailTemplatePage.clickSubmitButton();
271269

272270
await expect(createEmailTemplatePage.errorSummary).toBeVisible();
273271

@@ -309,7 +307,7 @@ test.describe('Create Email message template Page', () => {
309307

310308
await createEmailTemplatePage.messageTextArea.fill('template-message');
311309

312-
await createEmailTemplatePage.clickContinueButton();
310+
await createEmailTemplatePage.clickSubmitButton();
313311

314312
const emailNameErrorLink = createEmailTemplatePage.errorSummary.locator(
315313
`[href="#emailTemplateName"]`
@@ -335,7 +333,7 @@ test.describe('Create Email message template Page', () => {
335333

336334
await createEmailTemplatePage.messageTextArea.fill('template-message');
337335

338-
await createEmailTemplatePage.clickContinueButton();
336+
await createEmailTemplatePage.clickSubmitButton();
339337

340338
const emailSubjectLineErrorLink =
341339
createEmailTemplatePage.errorSummary.locator(
@@ -364,7 +362,7 @@ test.describe('Create Email message template Page', () => {
364362
'template-subject-line'
365363
);
366364

367-
await createEmailTemplatePage.clickContinueButton();
365+
await createEmailTemplatePage.clickSubmitButton();
368366

369367
const emailMessageErrorLink =
370368
createEmailTemplatePage.errorSummary.locator(

‎tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-email-page.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ test.describe('Preview Email message template Page', () => {
108108

109109
await previewEmailTemplatePage.editRadioOption.click();
110110

111-
await previewEmailTemplatePage.clickContinueButton();
111+
await previewEmailTemplatePage.clickSubmitButton();
112112

113113
await expect(page).toHaveURL(
114114
`${baseURL}/templates/create-email-template/${sessions.valid.id}`
@@ -125,7 +125,7 @@ test.describe('Preview Email message template Page', () => {
125125

126126
await previewEmailTemplatePage.submitRadioOption.click();
127127

128-
await previewEmailTemplatePage.clickContinueButton();
128+
await previewEmailTemplatePage.clickSubmitButton();
129129

130130
await expect(page).toHaveURL(
131131
`${baseURL}/templates/submit-email-template/${sessions.valid.id}`
@@ -165,7 +165,7 @@ test.describe('Preview Email message template Page', () => {
165165

166166
await previewEmailTemplatePage.loadPage(sessions.valid.id);
167167

168-
await previewEmailTemplatePage.clickContinueButton();
168+
await previewEmailTemplatePage.clickSubmitButton();
169169

170170
await expect(previewEmailTemplatePage.errorSummary).toBeVisible();
171171

‎tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-nhs-app-page.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ test.describe('Preview NHS App template Page', () => {
107107

108108
await previewNhsAppTemplatePage.editRadioOption.click();
109109

110-
await previewNhsAppTemplatePage.clickContinueButton();
110+
await previewNhsAppTemplatePage.clickSubmitButton();
111111

112112
await expect(page).toHaveURL(
113113
`${baseURL}/templates/create-nhs-app-template/${sessions.valid.id}`
@@ -124,7 +124,7 @@ test.describe('Preview NHS App template Page', () => {
124124

125125
await previewNhsAppTemplatePage.submitRadioOption.click();
126126

127-
await previewNhsAppTemplatePage.clickContinueButton();
127+
await previewNhsAppTemplatePage.clickSubmitButton();
128128

129129
await expect(page).toHaveURL(
130130
`${baseURL}/templates/submit-nhs-app-template/${sessions.valid.id}`
@@ -164,7 +164,7 @@ test.describe('Preview NHS App template Page', () => {
164164

165165
await previewNhsAppTemplatePage.loadPage(sessions.valid.id);
166166

167-
await previewNhsAppTemplatePage.clickContinueButton();
167+
await previewNhsAppTemplatePage.clickSubmitButton();
168168

169169
await expect(previewNhsAppTemplatePage.errorSummary).toBeVisible();
170170

‎tests/test-team/template-mgmt-component-tests/sms/template-mgmt-create-sms-page.component.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ test.describe('Create SMS message template Page', () => {
207207
'This is an SMS message'
208208
);
209209

210-
await createSmsTemplatePage.clickContinueButton();
210+
await createSmsTemplatePage.clickSubmitButton();
211211

212212
await expect(page).toHaveURL(
213213
`${baseURL}/templates/preview-text-message-template/${sessions.submit.id}`
@@ -228,9 +228,7 @@ test.describe('Create SMS message template Page', () => {
228228

229229
await createSmsTemplatePage.messageTextArea.fill(templateMessage);
230230

231-
await createSmsTemplatePage.clickContinueButton();
232-
233-
await page.getByRole('button', { name: 'Continue' }).click();
231+
await createSmsTemplatePage.clickSubmitButton();
234232

235233
await expect(createSmsTemplatePage.nameInput).toHaveValue(templateName);
236234

@@ -270,7 +268,7 @@ test.describe('Create SMS message template Page', () => {
270268

271269
await createSmsTemplatePage.loadPage(sessions.empty.id);
272270

273-
await createSmsTemplatePage.clickContinueButton();
271+
await createSmsTemplatePage.clickSubmitButton();
274272

275273
await expect(createSmsTemplatePage.errorSummary).toBeVisible();
276274

@@ -300,7 +298,7 @@ test.describe('Create SMS message template Page', () => {
300298

301299
await createSmsTemplatePage.messageTextArea.fill('template-message');
302300

303-
await createSmsTemplatePage.clickContinueButton();
301+
await createSmsTemplatePage.clickSubmitButton();
304302

305303
const smsNameErrorLink = createSmsTemplatePage.errorSummary.locator(
306304
`[href="#smsTemplateName"]`
@@ -324,7 +322,7 @@ test.describe('Create SMS message template Page', () => {
324322

325323
await createSmsTemplatePage.nameInput.fill('template-name');
326324

327-
await createSmsTemplatePage.clickContinueButton();
325+
await createSmsTemplatePage.clickSubmitButton();
328326

329327
const smsMessageErrorLink = createSmsTemplatePage.errorSummary.locator(
330328
'[href="#smsTemplateMessage"]'

‎tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-sms-page.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ test.describe('Preview SMS message template Page', () => {
105105

106106
await previewSmsTemplatePage.editRadioOption.click();
107107

108-
await previewSmsTemplatePage.clickContinueButton();
108+
await previewSmsTemplatePage.clickSubmitButton();
109109

110110
await expect(page).toHaveURL(
111111
`${baseURL}/templates/create-text-message-template/${sessions.valid.id}`
@@ -122,7 +122,7 @@ test.describe('Preview SMS message template Page', () => {
122122

123123
await previewSmsTemplatePage.submitRadioOption.click();
124124

125-
await previewSmsTemplatePage.clickContinueButton();
125+
await previewSmsTemplatePage.clickSubmitButton();
126126

127127
await expect(page).toHaveURL(
128128
`${baseURL}/templates/submit-text-message-template/${sessions.valid.id}`
@@ -162,7 +162,7 @@ test.describe('Preview SMS message template Page', () => {
162162

163163
await previewSmsTemplatePage.loadPage(sessions.valid.id);
164164

165-
await previewSmsTemplatePage.clickContinueButton();
165+
await previewSmsTemplatePage.clickSubmitButton();
166166

167167
await expect(previewSmsTemplatePage.errorSummary).toBeVisible();
168168

‎tests/test-team/template-mgmt-component-tests/template-mgmt-choose-page.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ test.describe('Choose Template Type Page', () => {
135135
const chooseTemplatePage = new TemplateMgmtChoosePage(page);
136136

137137
await chooseTemplatePage.loadPage(emptySessionData.id);
138-
await chooseTemplatePage.clickContinueButton();
138+
await chooseTemplatePage.clickSubmitButton();
139139

140140
await expect(page).toHaveURL(
141141
`${baseURL}/templates/choose-a-template-type/${emptySessionData.id}`
@@ -161,7 +161,7 @@ test.describe('Choose Template Type Page', () => {
161161

162162
await chooseTemplatePage.loadPage(sessionDataForRadioSelect.id);
163163
await chooseTemplatePage.checkRadioButton(label);
164-
await chooseTemplatePage.clickContinueButton();
164+
await chooseTemplatePage.clickSubmitButton();
165165

166166
await expect(page).toHaveURL(
167167
`${baseURL}/templates/create-${path}-template/${sessionDataForRadioSelect.id}`

‎tests/test-team/template-mgmt-component-tests/template-mgmt-create-nhs-app-template-page.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ test.describe('Create NHS App Template Page', () => {
9191
expect(await createTemplatePage.pageHeader.textContent()).toBe(
9292
'Create NHS App message template'
9393
);
94-
await createTemplatePage.clickContinueButton();
94+
await createTemplatePage.clickSubmitButton();
9595
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
9696

9797
await expect(
@@ -114,7 +114,7 @@ test.describe('Create NHS App Template Page', () => {
114114
await page.locator('[id="nhsAppTemplateName"]').fill(templateName);
115115
const templateMessage = 'Test Message box';
116116
await page.locator('[id="nhsAppTemplateMessage"]').fill(templateMessage);
117-
await createTemplatePage.clickContinueButton();
117+
await createTemplatePage.clickSubmitButton();
118118
await expect(page.getByRole('heading', { level: 1 })).toContainText(
119119
'NHS Testing 123'
120120
);
@@ -136,7 +136,7 @@ test.describe('Create NHS App Template Page', () => {
136136
);
137137
const templateName = 'NHS Testing 123';
138138
await page.locator('[id="nhsAppTemplateName"]').fill(templateName);
139-
await createTemplatePage.clickContinueButton();
139+
await createTemplatePage.clickSubmitButton();
140140
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
141141
await expect(
142142
page.locator('ul[class="nhsuk-list nhsuk-error-summary__list"] > li')
@@ -159,7 +159,7 @@ test.describe('Create NHS App Template Page', () => {
159159
);
160160
const templateMessage = 'Test Message box';
161161
await page.locator('[id="nhsAppTemplateMessage"]').fill(templateMessage);
162-
await createTemplatePage.clickContinueButton();
162+
await createTemplatePage.clickSubmitButton();
163163
await expect(page.locator('.nhsuk-error-summary')).toBeVisible();
164164

165165
await expect(

0 commit comments

Comments
 (0)