From 8f623ad58b705cfc8592dc3ddf1568dc7550a0b4 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alisonmllr20@gmail.com>
Date: Tue, 3 Dec 2019 16:02:57 -0500
Subject: [PATCH] fix existing tests

---
 .../client_integration/helpers/constants.ts   | 17 +++++------------
 .../helpers/template_form.helpers.ts          | 15 ++++-----------
 .../template_clone.test.tsx                   |  8 +++++++-
 .../template_create.test.tsx                  | 19 ++++---------------
 .../client_integration/template_edit.test.tsx |  2 +-
 .../mappings_editor/mappings_state.tsx        |  1 -
 6 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/x-pack/legacy/plugins/index_management/__jest__/client_integration/helpers/constants.ts b/x-pack/legacy/plugins/index_management/__jest__/client_integration/helpers/constants.ts
index db29ed844b606b..c979bdf3ae05ef 100644
--- a/x-pack/legacy/plugins/index_management/__jest__/client_integration/helpers/constants.ts
+++ b/x-pack/legacy/plugins/index_management/__jest__/client_integration/helpers/constants.ts
@@ -26,16 +26,9 @@ export const ALIASES = {
 };
 
 export const MAPPINGS = {
-  _source: {
-    enabled: false,
-  },
-  properties: {
-    host_name: {
-      type: 'keyword',
-    },
-    created_at: {
-      type: 'date',
-      format: 'EEE MMM dd HH:mm:ss Z yyyy',
-    },
-  },
+  dynamic: true,
+  date_detection: true,
+  numeric_detection: true,
+  dynamic_date_formats: [],
+  properties: {},
 };
diff --git a/x-pack/legacy/plugins/index_management/__jest__/client_integration/helpers/template_form.helpers.ts b/x-pack/legacy/plugins/index_management/__jest__/client_integration/helpers/template_form.helpers.ts
index 1b75f4e1909340..59ef2f3d7a7f90 100644
--- a/x-pack/legacy/plugins/index_management/__jest__/client_integration/helpers/template_form.helpers.ts
+++ b/x-pack/legacy/plugins/index_management/__jest__/client_integration/helpers/template_form.helpers.ts
@@ -15,7 +15,7 @@ export interface TemplateFormTestBed extends TestBed<TemplateFormTestSubjects> {
     clickSubmitButton: () => void;
     completeStepOne: ({ name, indexPatterns, order, version }: Partial<Template>) => void;
     completeStepTwo: (settings: string) => void;
-    completeStepThree: (mappings: string) => void;
+    completeStepThree: () => void;
     completeStepFour: (aliases: string) => void;
     selectSummaryTab: (tab: 'summary' | 'request') => void;
   };
@@ -85,17 +85,10 @@ export const formSetup = async (
     component.update();
   };
 
-  const completeStepThree = async (mappings: string) => {
-    const { find, component } = testBed;
-
-    if (mappings) {
-      find('mockCodeEditor').simulate('change', {
-        jsonString: mappings,
-      }); // Using mocked EuiCodeEditor
-      await nextTick(50);
-      component.update();
-    }
+  const completeStepThree = async () => {
+    const { component } = testBed;
 
+    await nextTick();
     clickNextButton();
     await nextTick(50); // hooks updates cycles are tricky, adding some latency is needed
     component.update();
diff --git a/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_clone.test.tsx b/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_clone.test.tsx
index 997fe8cff2dace..4c4a825ce00231 100644
--- a/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_clone.test.tsx
+++ b/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_clone.test.tsx
@@ -9,7 +9,11 @@ import { act } from 'react-dom/test-utils';
 import { setupEnvironment, pageHelpers, nextTick } from './helpers';
 import { TemplateFormTestBed } from './helpers/template_form.helpers';
 import * as fixtures from '../../test/fixtures';
-import { TEMPLATE_NAME, INDEX_PATTERNS as DEFAULT_INDEX_PATTERNS } from './helpers/constants';
+import {
+  TEMPLATE_NAME,
+  INDEX_PATTERNS as DEFAULT_INDEX_PATTERNS,
+  MAPPINGS,
+} from './helpers/constants';
 
 const { setup } = pageHelpers.templateClone;
 
@@ -50,6 +54,7 @@ describe('<TemplateClone />', () => {
   const templateToClone = fixtures.getTemplate({
     name: TEMPLATE_NAME,
     indexPatterns: ['indexPattern1'],
+    mappings: MAPPINGS,
   });
 
   beforeEach(async () => {
@@ -87,6 +92,7 @@ describe('<TemplateClone />', () => {
         component.update();
 
         // Bypass step 3 (mappings)
+        await nextTick();
         actions.clickNextButton();
         await nextTick();
         component.update();
diff --git a/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_create.test.tsx b/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_create.test.tsx
index e678b7a7f52d61..6bfa105461561e 100644
--- a/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_create.test.tsx
+++ b/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_create.test.tsx
@@ -130,17 +130,6 @@ describe('<TemplateCreate />', () => {
           expect(exists('stepMappings')).toBe(true);
           expect(find('stepTitle').text()).toEqual('Mappings (optional)');
         });
-
-        it('should not allow invalid json', async () => {
-          const { actions, form } = testBed;
-
-          await act(async () => {
-            // Complete step 3 (mappings) with invalid json
-            await actions.completeStepThree('{ invalidJsonString ');
-          });
-
-          expect(form.getErrorsMessages()).toContain('Invalid JSON format.');
-        });
       });
 
       describe('aliases (step 4)', () => {
@@ -155,7 +144,7 @@ describe('<TemplateCreate />', () => {
             await actions.completeStepTwo('{}');
 
             // Complete step 3 (mappings)
-            await actions.completeStepThree('{}');
+            await actions.completeStepThree();
           });
         });
 
@@ -196,7 +185,7 @@ describe('<TemplateCreate />', () => {
           await actions.completeStepTwo(JSON.stringify(SETTINGS));
 
           // Complete step 3 (mappings)
-          await actions.completeStepThree(JSON.stringify(MAPPINGS));
+          await actions.completeStepThree();
 
           // Complete step 4 (aliases)
           await actions.completeStepFour(JSON.stringify(ALIASES));
@@ -250,7 +239,7 @@ describe('<TemplateCreate />', () => {
           await actions.completeStepTwo(JSON.stringify({}));
 
           // Complete step 3 (mappings)
-          await actions.completeStepThree(JSON.stringify({}));
+          await actions.completeStepThree();
 
           // Complete step 4 (aliases)
           await actions.completeStepFour(JSON.stringify({}));
@@ -280,7 +269,7 @@ describe('<TemplateCreate />', () => {
           await actions.completeStepTwo(JSON.stringify(SETTINGS));
 
           // Complete step 3 (mappings)
-          await actions.completeStepThree(JSON.stringify(MAPPINGS));
+          await actions.completeStepThree();
 
           // Complete step 4 (aliases)
           await actions.completeStepFour(JSON.stringify(ALIASES));
diff --git a/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_edit.test.tsx b/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_edit.test.tsx
index 975d82b9360540..931c3332df85ed 100644
--- a/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_edit.test.tsx
+++ b/x-pack/legacy/plugins/index_management/__jest__/client_integration/template_edit.test.tsx
@@ -94,7 +94,7 @@ describe('<TemplateEdit />', () => {
         await actions.completeStepTwo(JSON.stringify(SETTINGS));
 
         // Step 3 (mappings)
-        await actions.completeStepThree(JSON.stringify(MAPPINGS));
+        await actions.completeStepThree();
 
         // Step 4 (aliases)
         await actions.completeStepFour(JSON.stringify(ALIASES));
diff --git a/x-pack/legacy/plugins/index_management/public/app/components/mappings_editor/mappings_state.tsx b/x-pack/legacy/plugins/index_management/public/app/components/mappings_editor/mappings_state.tsx
index c9ba1b5a703af8..ad787b928e0570 100644
--- a/x-pack/legacy/plugins/index_management/public/app/components/mappings_editor/mappings_state.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/components/mappings_editor/mappings_state.tsx
@@ -82,7 +82,6 @@ export const MappingsState = React.memo(({ children, onUpdate, defaultValue }: P
   const [state, dispatch] = useReducer(reducer, initialState);
 
   useEffect(() => {
-    // console.log('State update', state);
     // If we are creating a new field, but haven't entered any name
     // it is valid and we can byPass its form validation (that requires a "name" to be defined)
     const isFieldFormVisible = state.fieldForm !== undefined;