Skip to content

Commit 4095435

Browse files
authored
CCM-11889: use internal user id (#777)
1 parent 693340c commit 4095435

File tree

93 files changed

+833
-418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+833
-418
lines changed

.github/workflows/stage-2-test.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ jobs:
8686
- name: "Restore node_modules from cache"
8787
uses: ./.github/actions/node-modules-cache
8888
with:
89-
node_version: "${{ inputs.nodejs_version }}"
89+
# Pinned Node version for running unit tests to ensure that coverage checks work as expected
90+
# Long term fix covered in CCM-9959
91+
node_version: "22.21.1"
9092
- name: "Generate dependencies"
9193
run: |
9294
npm run generate-dependencies --workspaces --if-present

frontend/src/__tests__/app/create-nhs-app-template/page.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import content from '@content/content';
99
const { pageTitle } = content.components.templateFormNhsApp;
1010

1111
jest.mock('@forms/NhsAppTemplateForm/NhsAppTemplateForm');
12+
jest.mock('nhs-notify-web-template-management-utils/logger');
1213

1314
describe('CreateNHSAppTemplatePage', () => {
1415
beforeEach(jest.resetAllMocks);

frontend/src/__tests__/app/create-text-message-template/page.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import content from '@content/content';
99
const { pageTitle } = content.components.templateFormSms;
1010

1111
jest.mock('@forms/SmsTemplateForm/SmsTemplateForm');
12+
jest.mock('nhs-notify-web-template-management-utils/logger');
1213

1314
describe('CreateSMSTemplatePage', () => {
1415
beforeEach(jest.resetAllMocks);

frontend/src/__tests__/app/message-plans/edit-message-plan-settings/page.test.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,21 @@ const routingConfig = RoutingConfigFactory.create({
2323
campaignId: 'aff79ee0-4481-4fa3-8a1a-0df53c7b41e5',
2424
});
2525

26+
const errorLogger = console.error;
27+
2628
beforeAll(() => {
2729
jest.mocked(redirect).mockImplementation((url, type) => {
2830
throw new NextRedirectError(url, type);
2931
});
3032
jest.mocked(getRoutingConfig).mockResolvedValue(routingConfig);
3133
jest.mocked(fetchClient).mockResolvedValue({ features: {}, campaignIds: [] });
3234
jest.mocked(verifyFormCsrfToken).mockResolvedValue(true);
35+
global.console.error = jest.fn(); // suppress error logging in expected error tests
36+
});
37+
38+
afterAll(() => {
39+
jest.resetAllMocks();
40+
global.console.error = errorLogger;
3341
});
3442

3543
beforeEach(() => {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { TemplateFormState } from 'nhs-notify-web-template-management-utils';
88
import { TemplateDto } from 'nhs-notify-backend-client';
99

1010
jest.mock('@utils/amplify-utils');
11+
jest.mock('nhs-notify-web-template-management-utils/logger');
1112

1213
jest.mock('react', () => {
1314
const originalModule = jest.requireActual('react');

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@ jest.mock('react', () => {
2323
};
2424
});
2525

26+
const errorLogger = console.error;
27+
28+
beforeAll(() => {
29+
global.console.error = jest.fn(); // suppress error logging in tests
30+
});
31+
32+
afterAll(() => {
33+
jest.resetAllMocks();
34+
global.console.error = errorLogger;
35+
});
36+
2637
test('renders page with preloaded field values', () => {
2738
const container = render(
2839
<EmailTemplateForm

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@ jest.mock('react', () => {
2424
};
2525
});
2626

27+
const errorLogger = console.error;
28+
29+
beforeAll(() => {
30+
global.console.error = jest.fn(); // suppress error logging in tests
31+
});
32+
33+
afterAll(() => {
34+
jest.resetAllMocks();
35+
global.console.error = errorLogger;
36+
});
37+
2738
test('renders page', async () => {
2839
const user = userEvent.setup();
2940

frontend/src/__tests__/components/forms/RequestProof/server-action.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { TemplateDto } from 'nhs-notify-backend-client';
1010
jest.mock('next/navigation');
1111
jest.mock('@utils/form-actions');
1212
jest.mock('@utils/amplify-utils');
13+
jest.mock('nhs-notify-web-template-management-utils/logger');
1314

1415
const redirectMock = jest.mocked(redirect);
1516
const getTemplateMock = jest.mocked(getTemplate);

frontend/src/__tests__/components/forms/SubmitTemplate/server-action.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { TemplateDto } from 'nhs-notify-backend-client';
1010
jest.mock('next/navigation');
1111
jest.mock('@utils/form-actions');
1212
jest.mock('@utils/amplify-utils');
13+
jest.mock('nhs-notify-web-template-management-utils/logger');
1314

1415
const redirectMock = jest.mocked(redirect);
1516
const getTemplateMock = jest.mocked(getTemplate);

frontend/src/__tests__/components/molecules/MessagePlans.test.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ jest.mock('@molecules/MessagePlansList/MessagePlansList');
77
const MessagePlansListMock = jest.mocked(MessagePlansList);
88

99
describe('MessagePlans', () => {
10+
const errorLogger = console.error;
11+
12+
beforeAll(() => {
13+
global.console.error = jest.fn(); // suppress error logging in tests
14+
});
15+
16+
afterAll(() => {
17+
jest.resetAllMocks();
18+
global.console.error = errorLogger;
19+
});
20+
1021
test('matches snapshot', () => {
1122
const production = {
1223
count: 2,

0 commit comments

Comments
 (0)