Merge remote-tracking branch 'origin/feature/CCM-10387-multi-user-update' into feature/CCM-10387-multi-user-update

Author: alexnuttall

frontend/jest.setup.ts

@@ -33,3 +33,8 @@ createMocks();
 
 // set feature flag
 process.env.NEXT_PUBLIC_ENABLE_PROOFING = 'true';
+
+// mock unimplemented scrollIntoView
+if (typeof window !== 'undefined') {
+  window.HTMLElement.prototype.scrollIntoView = jest.fn();
+}

frontend/src/__tests__/components/atoms/__snapshots__/CodeExample.test.tsx.snap

@@ -8,11 +8,15 @@ exports[`CodeExample component renders component correctly 1`] = `
   >
     This is an example of markdown:
   </span>
-  <code
-    aria-describedby="test-id"
+  <pre
+    class="nhsuk-code-block"
   >
-    # A test example
-  </code>
+    <code
+      aria-describedby="test-id"
+    >
+      # A test example
+    </code>
+  </pre>
 </DocumentFragment>
 `;
 
@@ -24,11 +28,15 @@ exports[`CodeExample component renders component correctly when optional class i
   >
     This is an example of markdown:
   </span>
-  <code
-    aria-describedby="test-id"
-    class="test-class"
+  <pre
+    class="nhsuk-code-block"
   >
-    # A test example
-  </code>
+    <code
+      aria-describedby="test-id"
+      class="test-class"
+    >
+      # A test example
+    </code>
+  </pre>
 </DocumentFragment>
 `;

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

@@ -66,7 +66,7 @@ describe('Choose template page', () => {
   it('renders error component', () => {
     const mockUseActionState = jest.fn().mockReturnValue([
       {
-        validationError: {
+        errorState: {
           formErrors: [],
           fieldErrors: {
             page: ['Component error message'],

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

@@ -16,7 +16,7 @@ test('submit form - validation error', async () => {
   );
 
   expect(response).toEqual({
-    validationError: {
+    errorState: {
       formErrors: [],
       fieldErrors: {
         templateType: ['Select a template type'],

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

@@ -70,7 +70,7 @@ describe('Choose template page', () => {
   it('renders error component', () => {
     const mockUseActionState = jest.fn().mockReturnValue([
       {
-        validationError: {
+        errorState: {
           formErrors: [],
           fieldErrors: {
             page: ['Component error message'],

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

@@ -38,7 +38,7 @@ test('submit form - validation error', async () => {
   );
 
   expect(response).toEqual({
-    validationError: {
+    errorState: {
       formErrors: [],
       fieldErrors: {
         templateType: ['Select a template type'],

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

@@ -27,7 +27,7 @@ test('renders page with preloaded field values', () => {
   const container = render(
     <EmailTemplateForm
       initialState={mockDeep<TemplateFormState<EmailTemplate>>({
-        validationError: undefined,
+        errorState: undefined,
         name: 'template-name',
         subject: 'template-subject-line',
         message: 'template-message',
@@ -41,7 +41,7 @@ test('renders page without back link for initial state with id - edit mode', ()
   const container = render(
     <EmailTemplateForm
       initialState={mockDeep<TemplateFormState<EmailTemplate>>({
-        validationError: undefined,
+        errorState: undefined,
         name: 'template-name',
         subject: 'template-subject-line',
         message: 'template-message',
@@ -56,7 +56,7 @@ test('renders page one error', () => {
   const container = render(
     <EmailTemplateForm
       initialState={mockDeep<TemplateFormState<EmailTemplate>>({
-        validationError: {
+        errorState: {
           formErrors: [],
           fieldErrors: {
             emailTemplateName: ['Template name error'],
@@ -75,7 +75,7 @@ test('renders page with multiple errors', () => {
   const container = render(
     <EmailTemplateForm
       initialState={mockDeep<TemplateFormState<EmailTemplate>>({
-        validationError: {
+        errorState: {
           formErrors: [],
           fieldErrors: {
             emailTemplateName: ['Template name error'],
@@ -96,7 +96,7 @@ test('Client-side validation triggers', () => {
   const container = render(
     <EmailTemplateForm
       initialState={mockDeep<TemplateFormState<EmailTemplate>>({
-        validationError: undefined,
+        errorState: undefined,
         name: 'template-name',
         subject: 'template-subject-line',
         message: 'template-message',