fix integration tests

elastic · Jul 11, 2024 · 9b541d7 · 9b541d7
1 parent e7a58ae
commit 9b541d7
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 98 deletions.
diff --git a/...ck/test/cases_api_integration/security_and_spaces/tests/common/configure/get_configure.ts b/...ck/test/cases_api_integration/security_and_spaces/tests/common/configure/get_configure.ts
@@ -140,22 +140,7 @@ export default ({ getService }: FtrProviderContext): void => {
       const data = removeServerGeneratedPropertiesFromSavedObject(configuration[0]);
       expect(data).to.eql(
         getConfigurationOutput(false, {
-          templates: [
-            {
-              ...mockTemplates[0],
-              caseFields: {
-                customFields: [],
-              },
-            },
-            { ...mockTemplates[1] },
-            {
-              ...mockTemplates[2],
-              caseFields: {
-                ...mockTemplates[2].caseFields,
-                customFields: [],
-              },
-            },
-          ],
+          templates: mockTemplates,
         })
       );
     });

diff --git a/...k/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts b/...k/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
@@ -123,7 +123,20 @@ export default ({ getService }: FtrProviderContext): void => {
           key: 'test_template_1',
           name: 'First test template',
           description: 'This is a first test template',
-          caseFields: null,
+          caseFields: {
+            customFields: [
+              {
+                key: 'text_field_1',
+                type: CustomFieldTypes.TEXT,
+                value: null,
+              },
+              {
+                key: 'toggle_field_1',
+                value: false,
+                type: CustomFieldTypes.TOGGLE,
+              },
+            ],
+          },
         },
         {
           key: 'test_template_2',
@@ -165,6 +178,18 @@ export default ({ getService }: FtrProviderContext): void => {
           caseFields: {
             title: 'Case with sample template 3',
             tags: ['sample-3'],
+            customFields: [
+              {
+                key: 'text_field_1',
+                type: CustomFieldTypes.TEXT,
+                value: null,
+              },
+              {
+                key: 'toggle_field_1',
+                value: false,
+                type: CustomFieldTypes.TOGGLE,
+              },
+            ],
           },
         },
       ];
@@ -180,87 +205,7 @@ export default ({ getService }: FtrProviderContext): void => {
       expect(data).to.eql({
         ...getConfigurationOutput(false),
         customFields,
-        templates: [
-          {
-            ...templates[0],
-            caseFields: {
-              customFields: [
-                {
-                  key: 'text_field_1',
-                  type: CustomFieldTypes.TEXT,
-                  value: null,
-                },
-                {
-                  key: 'toggle_field_1',
-                  value: false,
-                  type: CustomFieldTypes.TOGGLE,
-                },
-              ],
-            },
-          },
-          { ...templates[1] },
-          {
-            ...templates[2],
-            caseFields: {
-              ...templates[2].caseFields,
-              customFields: [
-                {
-                  key: 'text_field_1',
-                  type: CustomFieldTypes.TEXT,
-                  value: null,
-                },
-                {
-                  key: 'toggle_field_1',
-                  value: false,
-                  type: CustomFieldTypes.TOGGLE,
-                },
-              ],
-            },
-          },
-        ],
-      });
-    });
-
-    it("removes custom field from templates when custom fields don't exist in the configuration", async () => {
-      const configuration = await createConfiguration(
-        supertest,
-        getConfigurationRequest({
-          overrides: {
-            customFields: [],
-            templates: [
-              {
-                key: 'test_template_1',
-                name: 'First test template',
-                description: 'This is a first test template',
-                caseFields: {
-                  customFields: [
-                    {
-                      key: 'random_key',
-                      type: CustomFieldTypes.TEXT,
-                      value: 'Test',
-                    },
-                  ],
-                },
-              },
-            ],
-          },
-        })
-      );
-
-      const data = removeServerGeneratedPropertiesFromSavedObject(configuration);
-      expect(data).to.eql({
-        ...getConfigurationOutput(false),
-        customFields: [],
-        templates: [
-          {
-            key: 'test_template_1',
-            name: 'First test template',
-            description: 'This is a first test template',
-            caseFields: {
-              customFields: [],
-            },
-          },
-        ],
+        templates: templates,
       });
     });
 
@@ -604,6 +549,62 @@ export default ({ getService }: FtrProviderContext): void => {
           400
         );
       });
+
+      it("should not create a configuration when templates have custom fields and custom fields don't exist in the configuration", async () => {
+        await createConfiguration(
+          supertest,
+          getConfigurationRequest({
+            overrides: {
+              customFields: [],
+              templates: [
+                {
+                  key: 'test_template_1',
+                  name: 'First test template',
+                  description: 'This is a first test template',
+                  caseFields: {
+                    customFields: [
+                      {
+                        key: 'random_key',
+                        type: CustomFieldTypes.TEXT,
+                        value: 'Test',
+                      },
+                    ],
+                  },
+                },
+              ],
+            },
+          }),
+          400
+        );
+      });
+
+      it('should not create a configuration when templates do not have custom fields and custom fields exist in the configuration', async () => {
+        await createConfiguration(
+          supertest,
+          getConfigurationRequest({
+            overrides: {
+              customFields: [
+                {
+                  key: 'random_key',
+                  type: CustomFieldTypes.TEXT,
+                  label: 'New custom field',
+                  defaultValue: 'Test',
+                  required: true,
+                },
+              ],
+              templates: [
+                {
+                  key: 'test_template_1',
+                  name: 'First test template',
+                  description: 'This is a first test template',
+                  caseFields: null,
+                },
+              ],
+            },
+          }),
+          400
+        );
+      });
     });
 
     describe('rbac', () => {