Skip to content

Commit 9184337

Browse files
committed
CCM-11544 Fixes
1 parent 50a1677 commit 9184337

File tree

10 files changed

+16
-15
lines changed

10 files changed

+16
-15
lines changed

frontend/src/__tests__/components/forms/ChooseChannelTemplate/__snapshots__/ChooseChannelTemplate.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2370,7 +2370,7 @@ exports[`ChooseChannelTemplate when there are no templates renders correctly 1`]
23702370
data-testid="channel-template-actions"
23712371
>
23722372
<a
2373-
class="nhsuk-u-font-size-19 nhsuk-u-display-block nhsuk-body-m"
2373+
class="nhsuk-u-font-size-19 nhsuk-body-m fit-content"
23742374
data-testid="go-to-templates-link"
23752375
href="/message-templates"
23762376
>

frontend/src/__tests__/components/forms/ChooseLanguageLetterTemplates/ChooseLanguageLetterTemplates.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ describe('ChooseLanguageLetterTemplates', () => {
165165
});
166166

167167
describe('when there are no templates', () => {
168-
it('displays "You do not have any foreign language letter templates" message', () => {
168+
it('displays "You do not have any other language letter templates" message', () => {
169169
renderComponent({
170170
templateList: [],
171171
});
172172

173173
expect(
174174
screen.getByText(
175-
'You do not have any foreign language letter templates yet.'
175+
'You do not have any other language letter templates yet.'
176176
)
177177
).toBeInTheDocument();
178178
expect(screen.queryByRole('checkbox')).not.toBeInTheDocument();

frontend/src/__tests__/components/forms/ChooseLanguageLetterTemplates/__snapshots__/ChooseLanguageLetterTemplates.test.tsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2402,14 +2402,14 @@ exports[`ChooseLanguageLetterTemplates when there are no templates renders corre
24022402
class="nhsuk-body"
24032403
data-testid="no-templates-message"
24042404
>
2405-
You do not have any foreign language letter templates yet.
2405+
You do not have any other language letter templates yet.
24062406
</p>
24072407
<div
24082408
class="nhsuk-form-group"
24092409
data-testid="channel-template-actions"
24102410
>
24112411
<a
2412-
class="nhsuk-u-font-size-19 nhsuk-u-display-block nhsuk-body-m"
2412+
class="nhsuk-u-font-size-19 nhsuk-body-m fit-content"
24132413
data-testid="go-to-templates-link"
24142414
href="/message-templates"
24152415
>

frontend/src/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export function ChooseChannelTemplate(props: ChooseChannelTemplateProps) {
128128
) : (
129129
<Link
130130
href={content.actions.goToTemplates.href}
131-
className='nhsuk-u-font-size-19 nhsuk-u-display-block nhsuk-body-m'
131+
className='nhsuk-u-font-size-19 nhsuk-body-m fit-content'
132132
data-testid='go-to-templates-link'
133133
>
134134
{content.actions.goToTemplates.text}

frontend/src/components/forms/ChooseLanguageLetterTemplates/ChooseLanguageLetterTemplates.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export function ChooseLanguageLetterTemplates(
157157
) : (
158158
<Link
159159
href={content.actions.goToTemplates.href}
160-
className='nhsuk-u-font-size-19 nhsuk-u-display-block nhsuk-body-m'
160+
className='nhsuk-u-font-size-19 nhsuk-body-m fit-content'
161161
data-testid='go-to-templates-link'
162162
>
163163
{content.actions.goToTemplates.text}

frontend/src/styles/app.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,7 @@ a.nhsuk-link--no-visited-state {
137137
}
138138
}
139139
}
140+
141+
.fit-content {
142+
width: fit-content;
143+
}

tests/test-team/pages/routing/nhs-app/choose-nhs-app-template-page.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { type Page } from '@playwright/test';
21
import { TemplateMgmtChooseTemplateForMessagePlanBasePage } from 'pages/template-mgmt-choose-template-base-page';
32

43
export class RoutingChooseNhsAppTemplatePage extends TemplateMgmtChooseTemplateForMessagePlanBasePage {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export abstract class TemplateMgmtChooseTemplateForMessagePlanBasePage extends T
2828
this.previousSelectionDetails = page.getByTestId(
2929
'previous-selection-details'
3030
);
31-
this.formError = page.locator('#channel-template--error-message');
31+
this.formError = page.locator('#channelTemplate--error-message');
3232
this.templatesTable = page.getByTestId('channel-templates-table');
3333
}
3434

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,10 @@ test.describe('Routing - Choose large print letter template page', () => {
285285

286286
const errorLink =
287287
chooseLargePrintLetterTemplatePage.errorSummaryList.first();
288-
await expect(errorLink).toHaveText('Choose a letter template');
288+
await expect(errorLink).toHaveText('Choose a large print letter template');
289289

290290
await expect(chooseLargePrintLetterTemplatePage.formError).toHaveText(
291-
'Choose a letter template'
291+
'Error: Choose a large print letter template'
292292
);
293293

294294
await chooseLargePrintLetterTemplatePage
@@ -297,7 +297,7 @@ test.describe('Routing - Choose large print letter template page', () => {
297297

298298
await chooseLargePrintLetterTemplatePage.saveAndContinueButton.click();
299299

300-
await expect(page).toHaveURL(
300+
await page.waitForURL(
301301
`${baseURL}/templates/message-plans/choose-templates/${routingConfigs.valid.id}`
302302
);
303303
});

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,7 @@ test.describe('Routing - Choose other language letter templates page', () => {
336336

337337
await expect(
338338
chooseOtherLanguageLetterTemplatePage.noTemplatesMessage
339-
).toHaveText(
340-
'You do not have any foreign language letter templates yet.'
341-
);
339+
).toHaveText('You do not have any o language letter templates yet.');
342340

343341
await chooseOtherLanguageLetterTemplatePage.goToTemplatesLink.click();
344342

0 commit comments

Comments
 (0)