[Cases] Custom fields feature fix tests

x-pack/plugins/cases/server/client/cases/create.test.ts

@@ -495,31 +495,11 @@ describe('create', () => {
       );
     });
 
-    it('should not throw an error and fill out missing customFields when they are undefined', async () => {
-      await expect(create({ ...theCase }, clientArgs, casesClient)).resolves.not.toThrow();
-
-      expect(clientArgs.services.caseService.postNewCase).toHaveBeenCalledWith(
-        expect.objectContaining({
-          attributes: {
-            ...theCase,
-            closed_by: null,
-            closed_at: null,
-            category: null,
-            created_at: expect.any(String),
-            created_by: expect.any(Object),
-            updated_at: null,
-            updated_by: null,
-            external_service: null,
-            duration: null,
-            status: CaseStatuses.open,
-            customFields: [
-              { key: 'first_key', type: 'text', value: null },
-              { key: 'second_key', type: 'toggle', value: null },
-            ],
-          },
-          id: expect.any(String),
-          refresh: false,
-        })
+    it('should throw an error when required customFields are undefined', async () => {
+      await expect(
+        create({ ...theCase }, clientArgs, casesClient)
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Failed to create case: Error: Missing required custom fields: first_key"`
       );
     });
 
@@ -534,7 +514,7 @@ describe('create', () => {
           casesClient
         )
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Failed to create case: Error: The length of the field customFields is too long. Array must be of length <= 5."`
+        `"Failed to create case: Error: The length of the field customFields is too long. Array must be of length <= 10."`
       );
     });
 

x-pack/plugins/cases/server/client/cases/update.test.ts

@@ -1068,7 +1068,7 @@ describe('update', () => {
           casesClient
         )
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Failed to update case, ids: [{\\"id\\":\\"mock-id-1\\",\\"version\\":\\"WzAsMV0=\\"}]: Error: The length of the field customFields is too long. Array must be of length <= 5."`
+        `"Failed to update case, ids: [{\\"id\\":\\"mock-id-1\\",\\"version\\":\\"WzAsMV0=\\"}]: Error: The length of the field customFields is too long. Array must be of length <= 10."`
       );
     });
 

x-pack/plugins/cases/server/client/cases/validators.ts

@@ -95,12 +95,12 @@ export const validateRequiredCustomFields = ({
   requestCustomFields,
   customFieldsConfiguration,
 }: CustomFieldValidationParams) => {
-  if (!Array.isArray(requestCustomFields) || !requestCustomFields.length) {
-    return;
-  }
-
   if (customFieldsConfiguration === undefined) {
-    throw Boom.badRequest('No custom fields configured.');
+    if (!Array.isArray(requestCustomFields) || !requestCustomFields.length) {
+      return;
+    } else {
+      throw Boom.badRequest('No custom fields configured.');
+    }
   }
 
   const requiredCustomFields = customFieldsConfiguration.filter(
@@ -109,7 +109,7 @@ export const validateRequiredCustomFields = ({
 
   const invalidCustomFieldKeys = differenceWith(
     requiredCustomFields,
-    requestCustomFields,
+    requestCustomFields ?? [],
     (requiredVal, requestedVal) => requiredVal.key === requestedVal.key
   ).map((e) => e.key);
 

x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts

@@ -109,6 +109,13 @@ export default ({ getService }: FtrProviderContext): void => {
         const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]);
         expect(data).to.eql({
           ...postCaseResp(),
+          customFields: [
+            {
+              key: 'test_custom_field',
+              type: CustomFieldTypes.TEXT,
+              value: null,
+            },
+          ],
           title: 'new title',
           updated_by: defaultUser,
         });
@@ -329,7 +336,16 @@ export default ({ getService }: FtrProviderContext): void => {
           })
         );
 
-        const postedCase = await createCase(supertest, postCaseReq);
+        const postedCase = await createCase(supertest, {
+          ...postCaseReq,
+          customFields: [
+            {
+              key: 'test_custom_field_2',
+              type: CustomFieldTypes.TOGGLE,
+              value: true,
+            },
+          ],
+        });
         const patchedCases = await updateCase({
           supertest,
           params: {
@@ -368,7 +384,7 @@ export default ({ getService }: FtrProviderContext): void => {
         ]);
       });
 
-      it('should fill out missing custom fields', async () => {
+      it('should fill out missing optional custom fields', async () => {
         await createConfiguration(
           supertest,
           getConfigurationRequest({
@@ -391,7 +407,17 @@ export default ({ getService }: FtrProviderContext): void => {
           })
         );
 
-        const postedCase = await createCase(supertest, postCaseReq);
+        const postedCase = await createCase(supertest, {
+          ...postCaseReq,
+          customFields: [
+            {
+              key: 'test_custom_field_2',
+              type: CustomFieldTypes.TOGGLE,
+              value: true,
+            },
+          ],
+        });
+
         const patchedCases = await updateCase({
           supertest,
           params: {
@@ -1016,7 +1042,7 @@ export default ({ getService }: FtrProviderContext): void => {
           });
         });
 
-        it('400s when trying to create case with a missing required custom field', async () => {
+        it('400s when trying to patch a case with a missing required custom field', async () => {
           await createConfiguration(
             supertest,
             getConfigurationRequest({
@@ -1032,7 +1058,16 @@ export default ({ getService }: FtrProviderContext): void => {
               },
             })
           );
-          const postedCase = await createCase(supertest, postCaseReq);
+          const postedCase = await createCase(supertest, {
+            ...postCaseReq,
+            customFields: [
+              {
+                key: 'test_custom_field',
+                type: CustomFieldTypes.TEXT,
+                value: ['hello'],
+              },
+            ],
+          });
 
           await updateCase({
             supertest,
@@ -1049,7 +1084,7 @@ export default ({ getService }: FtrProviderContext): void => {
           });
         });
 
-        it('400s when trying to create case with a custom field with the wrong type', async () => {
+        it('400s when trying to patch a case with a custom field with the wrong type', async () => {
           await createConfiguration(
             supertest,
             getConfigurationRequest({
@@ -1059,7 +1094,7 @@ export default ({ getService }: FtrProviderContext): void => {
                     key: 'test_custom_field',
                     label: 'text',
                     type: CustomFieldTypes.TEXT,
-                    required: true,
+                    required: false,
                   },
                 ],
               },
@@ -1078,7 +1113,7 @@ export default ({ getService }: FtrProviderContext): void => {
                     {
                       key: 'test_custom_field',
                       type: CustomFieldTypes.TOGGLE,
-                      value: true,
+                      value: false,
                     },
                   ],
                 },

x-pack/test/functional/services/cases/common.ts

@@ -63,7 +63,6 @@ export function CasesCommonServiceProvider({ getService, getPageObject }: FtrPro
       const radioGroup = await testSubjects.find(testSubject);
       const label = await radioGroup.findByCssSelector(`label[for="${value}"]`);
       await label.click();
-      await this.assertRadioGroupValue(testSubject, value);
     },
 
     async selectSeverity(severity: CaseSeverity) {

x-pack/test/functional_with_es_ssl/apps/cases/group2/configure.ts

@@ -13,6 +13,7 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
   const testSubjects = getService('testSubjects');
   const cases = getService('cases');
   const toasts = getService('toasts');
+  const header = getPageObject('header');
 
   describe('Configure', function () {
     before(async () => {
@@ -25,14 +26,17 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
 
     describe('Closure options', function () {
       it('defaults the closure option correctly', async () => {
+        await header.waitUntilLoadingHasFinished();
         await cases.common.assertRadioGroupValue('closure-options-radio-group', 'close-by-user');
       });
 
       it('change closure option successfully', async () => {
+        await header.waitUntilLoadingHasFinished();
         await cases.common.selectRadioGroupValue('closure-options-radio-group', 'close-by-pushing');
         const toast = await toasts.getToastElement(1);
         expect(await toast.getVisibleText()).to.be('Saved external connection settings');
         await toasts.dismissAllToasts();
+        await cases.common.assertRadioGroupValue('closure-options-radio-group', 'close-by-pushing');
       });
     });
 

x-pack/test/security_solution_cypress/cypress/e2e/explore/cases/connectors.cy.ts

@@ -35,6 +35,7 @@ describe('Cases connectors', { tags: ['@ess', '@serverless'] }, () => {
     error: null,
     updated_at: null,
     updated_by: null,
+    customFields: [],
     mappings: [
       { source: 'title', target: 'short_description', action_type: 'overwrite' },
       { source: 'description', target: 'description', action_type: 'overwrite' },

x-pack/test/security_solution_cypress/cypress/objects/case.ts

@@ -74,6 +74,7 @@ export const getCaseResponse = (): Case => ({
   status: CaseStatuses.open,
   severity: CaseSeverity.HIGH,
   assignees: [],
+  customFields: [],
   settings: {
     syncAlerts: false,
   },