adds redirect to process end and fixes tests

Altinn · Dec 4, 2024 · 19ecb4a · 19ecb4a
1 parent e5b0a43
commit 19ecb4a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -54,10 +54,12 @@ export const App = () => (
         path={TaskKeys.ProcessEnd}
         element={<DefaultReceipt />}
       />
-      <Route
-        path={TaskKeys.CustomReceipt}
-        element={<CustomReceipt />}
-      />
+      <Route path={TaskKeys.CustomReceipt}>
+        <Route
+          path='*'
+          element={<CustomReceipt />}
+        />
+      </Route>
       <Route
         index
         element={<NavigateToStartUrl />}

diff --git a/src/components/wrappers/ProcessWrapper.tsx b/src/components/wrappers/ProcessWrapper.tsx
@@ -96,6 +96,11 @@ export const ProcessWrapper = () => {
   const isValidTaskId = useIsValidTaskId();
   const taskIdParam = useNavigationParam('taskId');
   const taskType = useGetTaskTypeById()(taskIdParam);
+  const process = useLaxProcessData();
+
+  if (process?.ended) {
+    return <NavigateToStartUrl />;
+  }
 
   if (!isValidTaskId(taskIdParam)) {
     return (

diff --git a/src/features/receipt/ReceiptContainer.test.tsx b/src/features/receipt/ReceiptContainer.test.tsx
@@ -137,7 +137,7 @@ describe('ReceiptContainer', () => {
 
     expect(
       screen.getByRole('heading', {
-        name: 'Skjema er sendt inn',
+        name: 'Skjemaet er sendt inn',
       }),
     ).toBeInTheDocument();
 

diff --git a/test/e2e/integration/frontend-test/custom-confirm.ts b/test/e2e/integration/frontend-test/custom-confirm.ts
@@ -31,6 +31,6 @@ describe('Custom confirm page', () => {
     cy.get('[data-componentid="confirmBody"]').should('contain.text', `på forrige side valgte du Petter.`);
     cy.findByRole('button', { name: /send inn/i }).click();
 
-    cy.get('#ReceiptContainer').should('contain.text', 'Skjema er sendt inn');
+    cy.get('#ReceiptContainer').should('contain.text', 'Skjemaet er sendt inn');
   });
 });