Oppdaterer tester

Author: nurrebass1

packages/bygger-backend/src/migration/migrationScripts.test.ts

@@ -142,8 +142,8 @@ describe('Migration scripts', () => {
           ...originalForm,
           properties: {
             ...originalForm.properties,
-            innsending: 'KUN_DIGITAL',
-            ettersending: undefined,
+            submissionTypes: ['DIGITAL'],
+            additionalSubmissionTypes: [],
           },
         };
         const { migratedForm: actual } = migrateForm(
@@ -175,7 +175,7 @@ describe('Migration scripts', () => {
           ...originalForm,
           properties: {
             ...originalForm.properties,
-            innsending: 'KUN_DIGITAL',
+            submissionTypes: ['DIGITAL'],
             ettersending: 'KUN_DIGITAL',
           },
         };
@@ -340,8 +340,8 @@ describe('Migration scripts', () => {
           properties: {
             ...originalForm.properties,
             skjemanummer: 'Form1',
-            innsending: 'KUN_DIGITAL',
-            ettersending: undefined,
+            submissionTypes: ['DIGITAL'],
+            additionalSubmissionTypes: [],
           },
         };
 
@@ -350,7 +350,7 @@ describe('Migration scripts', () => {
           properties: {
             ...originalForm.properties,
             skjemanummer: 'Form2',
-            innsending: 'KUN_DIGITAL',
+            submissionTypes: ['DIGITAL'],
             ettersending: 'KUN_DIGITAL',
           },
         };

packages/bygger/cypress/e2e/settings.spec.cy.ts

@@ -7,7 +7,7 @@ const submitData = {
   tema: 'BIL',
   downloadPdfButtonText: 'DownloadPDFBtnTest',
   submissionTypes: ['PAPER', 'DIGITAL'],
-  additionalSubmissionTypes: 'PAPIR_OG_DIGITAL',
+  additionalSubmissionTypes: ['PAPER', 'DIGITAL'],
   descriptionOfSignatures: 'Test Instructions',
   signatureLabel: 'Test account',
   signatureDescription: 'Instruction from test...',
@@ -65,7 +65,7 @@ describe('FormSettingsPage', () => {
       expect(req.body.properties.skjemanummer).to.include(submitData.skjemanummer);
       expect(req.body.properties.descriptionOfSignatures).to.include(submitData.descriptionOfSignatures);
       expect(req.body.properties.submissionTypes).to.deep.include.members(submitData.submissionTypes);
-      expect(req.body.properties.additionalSubmissionTypes).to.include(submitData.additionalSubmissionTypes);
+      expect(req.body.properties.additionalSubmissionTypes).to.deep.members(submitData.additionalSubmissionTypes);
       expect(req.body.properties.signatures[0].label).to.include(submitData.signatureLabel);
       expect(req.body.properties.signatures[0].description).to.include(submitData.signatureDescription);
       req.reply(req.body);
@@ -85,7 +85,9 @@ describe('FormSettingsPage', () => {
       cy.get(`input[type="checkbox"][value="${type}"]`).check({ force: true });
     });
 
-    cy.findByRole('combobox', { name: 'additionalSubmissionTypes' }).select(submitData.additionalSubmissionTypes);
+    submitData.additionalSubmissionTypes.forEach((type) => {
+      cy.get(`input[type="checkbox"][value="${type}"]`).check({ force: true });
+    });
 
     cy.findByRole('spinbutton', { name: 'Mellomlagringstid (dager)' }).focus();
     cy.findByRole('spinbutton', { name: 'Mellomlagringstid (dager)' }).clear();

packages/bygger/cypress/fixtures/form123456-published.json

@@ -3508,6 +3508,7 @@
     "skjemanummer": "TST-123456",
     "tema": "DAG",
     "submissionTypes": ["PAPER", "DIGITAL"],
+    "additionalSubmissionTypes": [],
     "signatures": [
       {
         "label": "Lege",

packages/bygger/cypress/fixtures/form123456.json

@@ -3375,6 +3375,7 @@
     "skjemanummer": "TST-123456",
     "tema": "DAG",
     "submissionTypes": ["PAPER", "DIGITAL"],
+    "additionalSubmissionTypes": [],
     "signatures": [
       {
         "label": "Lege",

packages/bygger/cypress/fixtures/formMultiValues.json

@@ -347,7 +347,7 @@
     "modifiedBy": "[email protected]",
     "publishedLanguages": [],
     "descriptionOfSignaturesPositionUnder": true,
-    "additionalSubmissionTypes": "INGEN",
+    "additionalSubmissionTypes": [],
     "declarationType": "default",
     "downloadPdfButtonText": "ab",
     "isTestForm": false,

packages/bygger/example_data/Form.json

@@ -363,6 +363,7 @@
   "machineName": "kxzxmneixaglyxf:debugSkjema",
   "properties": {
     "skjemanummer": "NAV 12-13.14",
-    "submissionTypes": []
+    "submissionTypes": [],
+    "additionalSubmissionTypes": []
   }
 }

packages/bygger/src/components/FormMetaDataEditor/fields/SubmissionFields.tsx

@@ -51,7 +51,7 @@ const SubmissionFields = ({ onChange, diff, form, errors }: SubmissionFieldsProp
         }
       />
 
-      {!!additionalSubmissionTypes && !submissionTypesUtils.isNoneSubmission(additionalSubmissionTypes) && (
+      {!submissionTypesUtils.isNoneSubmission(additionalSubmissionTypes) && (
         <TextField
           onWheel={(e) => e.currentTarget.blur()} // disable scroll wheel on number input
           className="mb"
@@ -110,7 +110,7 @@ const SubmissionFields = ({ onChange, diff, form, errors }: SubmissionFieldsProp
           })
         }
       >
-        {'Skjul valg for hvem innsendingen gjelder i ettersending∫'}
+        {'Skjul valg for hvem innsendingen gjelder i ettersendingsløsningen'}
       </Checkbox>
     </>
   );