Merge branch 'master' into nav-select-submission-value-removed-from-values

Author: akgagnat

.github/workflows/build-and-test.yaml

@@ -29,8 +29,14 @@ jobs:
         run: yarn check-types
       - name: 'Build'
         run: yarn build
-      - name: 'Test'
-        run: yarn test
+      - name: 'Test bygger'
+        run: yarn test:bygger
+      - name: 'Test fyllut'
+        run: yarn test:fyllut
+      - name: 'Test shared-components'
+        run: yarn test:shared-components
+      - name: 'Test shared-domain'
+        run: yarn test:shared-domain
 
   package-and-push-bygger:
     if: github.ref == 'refs/heads/master'

package.json

@@ -28,6 +28,10 @@
     "preview:bygger": "yarn workspace @navikt/bygger-backend preview",
     "preview:fyllut": "yarn workspace @navikt/fyllut-backend preview",
     "test": "concurrently \"yarn workspace @navikt/bygger-frontend test\" \"yarn workspace @navikt/bygger-backend test\" \"yarn workspace @navikt/fyllut-frontend test\" \"yarn workspace @navikt/fyllut-backend test\" \"yarn workspace @navikt/skjemadigitalisering-shared-domain test\" \"yarn workspace @navikt/skjemadigitalisering-shared-components test\"",
+    "test:bygger": "concurrently \"yarn workspace @navikt/bygger-frontend test\" \"yarn workspace @navikt/bygger-backend test\"",
+    "test:fyllut": "concurrently \"yarn workspace @navikt/fyllut-frontend test\" \"yarn workspace @navikt/fyllut-backend test\"",
+    "test:shared-domain": "yarn workspace @navikt/skjemadigitalisering-shared-domain test",
+    "test:shared-components": "yarn workspace @navikt/skjemadigitalisering-shared-components test",
     "test:coverage": "yarn workspaces run test:coverage",
     "cypress:bygger": "yarn workspace @navikt/bygger-frontend cypress",
     "cypress:fyllut": "yarn workspace @navikt/fyllut-frontend cypress",

packages/bygger/src/components/NavFormBuilder.test.jsx

@@ -1,5 +1,5 @@
 import { NavFormioJs } from '@navikt/skjemadigitalisering-shared-components';
-import { render, screen, waitFor, within } from '@testing-library/react';
+import { cleanup, render, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import createMockImplementation, { DEFAULT_PROJECT_URL } from '../../test/backendMockImplementation';
 import NavFormBuilder from './NavFormBuilder';
@@ -24,12 +24,17 @@ const DEFAULT_FORM_BUILDER_OPTIONS = {
 describe('NavFormBuilder', () => {
   beforeAll(() => {
     new NavFormioJs.Formio(DEFAULT_PROJECT_URL);
+  });
+
+  beforeEach(() => {
     vi.spyOn(NavFormioJs.Formio, 'fetch').mockImplementation(createMockImplementation());
   });
 
-  afterEach(() => {
+  afterEach(async () => {
     fetchMock.resetMocks();
-    window.confirm = undefined;
+    vi.restoreAllMocks();
+    cleanup();
+    await waitFor(() => expect(Object.keys(NavFormioJs.Formio.forms).length).toBe(0));
   });
 
   describe('mounting', () => {
@@ -78,7 +83,7 @@ describe('NavFormBuilder', () => {
 
     describe('remove button', () => {
       it('removes a component which no other component depends on', async () => {
-        const checkbox = screen.queryByLabelText('Oppgi din favorittfarge');
+        const checkbox = await screen.findByLabelText('Oppgi din favorittfarge');
         expect(checkbox).toBeInTheDocument();
 
         const builderComponent = findClosestWithAttribute(checkbox, BUILDER_COMP_TESTID_ATTR);
@@ -92,7 +97,7 @@ describe('NavFormBuilder', () => {
 
       it('prompts user when removing a component which other components depends on', async () => {
         window.confirm = vi.fn().mockImplementation(() => true);
-        const fieldset = screen.queryByRole('group', { name: /Your favorite time of the year/ });
+        const fieldset = await screen.findByRole('group', { name: /Your favorite time of the year/ });
         expect(fieldset).toBeInTheDocument();
 
         const builderComponent = findClosestWithAttribute(fieldset, BUILDER_COMP_TESTID_ATTR);
@@ -106,15 +111,15 @@ describe('NavFormBuilder', () => {
 
       it('does not remove component if user declines prompt', async () => {
         window.confirm = vi.fn().mockImplementation(() => false);
-        const fieldset = screen.queryByRole('group', { name: /Your favorite time of the year/ });
+        const fieldset = await screen.findByRole('group', { name: /Your favorite time of the year/ });
         expect(fieldset).toBeInTheDocument();
 
         const builderComponent = findClosestWithAttribute(fieldset, BUILDER_COMP_TESTID_ATTR);
 
         const removeComponentButton = await within(builderComponent).findByTitle('Slett');
         await userEvent.click(removeComponentButton);
 
-        expect(screen.queryByRole('group', { name: /Your favorite time of the year/ })).toBeInTheDocument();
+        expect(await screen.findByRole('group', { name: /Your favorite time of the year/ })).toBeInTheDocument();
         expect(onChangeMock.mock.calls).toHaveLength(0);
 
         expect(window.confirm.mock.calls).toHaveLength(1);
@@ -125,7 +130,7 @@ describe('NavFormBuilder', () => {
 
       it('prompts user when removing component containing component which other components depends on', async () => {
         window.confirm = vi.fn().mockImplementation(() => true);
-        const panel = screen.queryByText('Tilbakemelding');
+        const panel = await screen.findByText('Tilbakemelding');
         expect(panel).toBeInTheDocument();
 
         const builderComponent = findClosestWithAttribute(panel, BUILDER_COMP_TESTID_ATTR);
@@ -147,6 +152,7 @@ describe('NavFormBuilder', () => {
 
       it('prompts user when removing attachment panel', async () => {
         window.confirm = vi.fn().mockImplementation(() => true);
+        onReadyMock.mockReset();
         rerender(
           <NavFormBuilder
             form={{ ...testform, display: 'skjema' }}
@@ -155,12 +161,9 @@ describe('NavFormBuilder', () => {
             formBuilderOptions={DEFAULT_FORM_BUILDER_OPTIONS}
           />,
         );
+        await waitFor(() => expect(onReadyMock.mock.calls).toHaveLength(1));
 
-        const attachmentPanelLink = screen.queryByRole('link', { name: 'Vedlegg' });
-        expect(attachmentPanelLink).toBeInTheDocument();
-        await userEvent.click(attachmentPanelLink);
-
-        const attachmentPanel = screen.queryByRole('button', { name: 'Vedlegg' });
+        const attachmentPanel = await screen.findByRole('button', { name: 'Vedlegg' });
         expect(attachmentPanel).toBeInTheDocument();
         const builderComponent = findClosestWithAttribute(attachmentPanel, BUILDER_COMP_TESTID_ATTR);
         const removeComponentButtons = await within(builderComponent).findAllByTitle('Slett');
@@ -177,6 +180,7 @@ describe('NavFormBuilder', () => {
 
       it('does not remove attachment panel if user declines prompt', async () => {
         window.confirm = vi.fn().mockImplementation(() => false);
+        onReadyMock.mockReset();
         rerender(
           <NavFormBuilder
             form={{ ...testform, display: 'skjema' }}
@@ -185,12 +189,9 @@ describe('NavFormBuilder', () => {
             formBuilderOptions={DEFAULT_FORM_BUILDER_OPTIONS}
           />,
         );
+        await waitFor(() => expect(onReadyMock.mock.calls).toHaveLength(1));
 
-        const attachmentPanelLink = screen.queryByRole('link', { name: 'Vedlegg' });
-        expect(attachmentPanelLink).toBeInTheDocument();
-        await userEvent.click(attachmentPanelLink);
-
-        const attachmentPanel = screen.queryByRole('button', { name: 'Vedlegg' });
+        const attachmentPanel = await screen.findByRole('button', { name: 'Vedlegg' });
         expect(attachmentPanel).toBeInTheDocument();
         const builderComponent = findClosestWithAttribute(attachmentPanel, BUILDER_COMP_TESTID_ATTR);
         const removeComponentButtons = await within(builderComponent).findAllByTitle('Slett');
@@ -201,22 +202,22 @@ describe('NavFormBuilder', () => {
           'Du forsøker nå å slette vedleggspanelet. For å gjenopprette må et predefinert vedleggspanel trekkes inn. Vil du fremdeles slette panelet?',
         );
 
-        const attachmentPanelAfterNoDelete = screen.queryByRole('button', { name: 'Vedlegg' });
+        const attachmentPanelAfterNoDelete = await screen.findByRole('button', { name: 'Vedlegg' });
         expect(attachmentPanelAfterNoDelete).toBeInTheDocument();
       });
     });
 
     describe('conditional alert message in edit component', () => {
       it('is visible when component is depended upon by other components', async () => {
-        const fieldset = screen.queryByRole('group', { name: /Your favorite time of the year/ });
+        const fieldset = await screen.findByRole('group', { name: /Your favorite time of the year/ });
         expect(fieldset).toBeInTheDocument();
 
         const builderComponent = findClosestWithAttribute(fieldset, BUILDER_COMP_TESTID_ATTR);
 
         const editComponentButton = await within(builderComponent).findByTitle('Rediger');
         await userEvent.click(editComponentButton);
 
-        const conditionalAlert = screen.queryByRole('list', {
+        const conditionalAlert = await screen.findByRole('list', {
           name: 'Følgende komponenter har avhengighet til denne:',
         });
         expect(conditionalAlert).toBeInTheDocument();
@@ -225,7 +226,7 @@ describe('NavFormBuilder', () => {
       });
 
       it('is not visible when component is not depended upon by other components', async () => {
-        const textInput = screen.queryByLabelText('Oppgi din favorittfarge');
+        const textInput = await screen.findByLabelText('Oppgi din favorittfarge');
         expect(textInput).toBeInTheDocument();
 
         const builderComponent = findClosestWithAttribute(textInput, BUILDER_COMP_TESTID_ATTR);

packages/bygger/src/setupTests.ts

@@ -1,4 +1,5 @@
 import '@testing-library/jest-dom';
+import { cleanup } from '@testing-library/react';
 import { Blob } from 'node:buffer';
 import { URL } from 'node:url';
 import { vi } from 'vitest';
@@ -13,3 +14,11 @@ fetchMock.enableMocks();
 globalThis.URL = URL;
 // @ts-ignore
 globalThis.Blob = Blob;
+
+afterEach(() => {
+  cleanup();
+});
+
+afterAll(() => {
+  vi.restoreAllMocks();
+});

packages/fyllut-backend/package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "start": "cross-env-shell NODE_ENV=development vite",
     "build": "tsc && vite build",
-    "preview": "cross-env-shell NODE_ENV=development NO_FORM_VALIDATION=true FYLLUT_BUILD_DIR=\"../../fyllut/dist\" PORT=3001 \"node bin/copyDotEnvTestToDist.js && cd dist && node server.mjs\"",
+    "preview": "cross-env-shell NODE_ENV=development NO_DECORATOR=true NO_FORM_VALIDATION=true FYLLUT_BUILD_DIR=\"../../fyllut/dist\" PORT=3001 \"node bin/copyDotEnvTestToDist.js && cd dist && node server.mjs\"",
     "check-types": "tsc",
     "clean": "rimraf dist coverage node_modules",
     "test": "vitest --run",

packages/fyllut-backend/src/config/config.ts

@@ -56,7 +56,7 @@ const localDevelopmentConfig: DefaultConfig = {
   mockIdportenPid: process.env.MOCK_IDPORTEN_PID || '12345678911',
   mockIdportenJwt: process.env.MOCK_IDPORTEN_JWT || 'IDPORTEN_JWT',
   noFormValidation: process.env.NO_FORM_VALIDATION === 'true',
-  noDecorator: process.env.NO_DECORATOR === 'false',
+  noDecorator: process.env.NO_DECORATOR === 'true',
   tokenx: {
     ...tokenx,
     wellKnownUrl:

packages/fyllut-backend/src/renderIndex.ts

@@ -18,7 +18,6 @@ const renderIndex = async (req: Request, res: Response, next: NextFunction) => {
     const qpForm = req.query.form;
     const qpInnsendingsId = req.query.innsendingsId;
     const qpSub = req.query.sub as QueryParamSub;
-    const qbDisableDecorator = req.query.disableDecorator;
     let redirectUrl: string | undefined;
     let redirectParams: { [key: string]: any } = { ...req.query };
     if (qpForm) {
@@ -98,9 +97,6 @@ const renderIndex = async (req: Request, res: Response, next: NextFunction) => {
         httpStatusCode = 404;
       }
     }
-    if (!config.isProduction && qbDisableDecorator === 'true') {
-      return res.render('index.html', pageMeta);
-    }
 
     const decoratorFragments = await getDecorator(createRedirectUrl(req, res));
     res.status(httpStatusCode).render('index.html', {

packages/fyllut/src/setupTests.ts

@@ -1,8 +1,17 @@
 import '@testing-library/jest-dom';
+import { cleanup } from '@testing-library/react';
 import { vi } from 'vitest';
 import createFetchMock from 'vitest-fetch-mock';
 
 const fetchMock = createFetchMock(vi);
 
 fetchMock.enableMocks();
 fetchMock.dontMock();
+
+afterEach(() => {
+  cleanup();
+});
+
+afterAll(() => {
+  vi.restoreAllMocks();
+});

packages/shared-components/src/setupTests.ts

@@ -1,4 +1,5 @@
 import '@testing-library/jest-dom';
+import { cleanup } from '@testing-library/react';
 import { vi } from 'vitest';
 import createFetchMock from 'vitest-fetch-mock';
 
@@ -7,6 +8,14 @@ const fetchMock = createFetchMock(vi);
 fetchMock.enableMocks();
 fetchMock.dontMock();
 
+afterEach(() => {
+  cleanup();
+});
+
+afterAll(() => {
+  vi.restoreAllMocks();
+});
+
 Object.defineProperty(window, 'matchMedia', {
   writable: true,
   value: vi.fn().mockImplementation((query) => ({