Address CR changes

elastic · May 6, 2020 · ab76582 · ab76582
1 parent c56cb07
commit ab76582
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/...n/components/mappings_editor/__jest__/client_integration/datatypes/text_datatype.test.tsx b/...n/components/mappings_editor/__jest__/client_integration/datatypes/text_datatype.test.tsx
@@ -105,16 +105,6 @@ describe('Mappings editor: text datatype', () => {
       },
     };
 
-    let updatedMappings: any = {
-      ...defaultMappings,
-      properties: {
-        myField: {
-          ...defaultMappings.properties.myField,
-          ...defaultTextParameters,
-        },
-      },
-    };
-
     testBed = await setup({ value: defaultMappings, onChange: onChangeHandler });
 
     const {
@@ -150,6 +140,15 @@ describe('Mappings editor: text datatype', () => {
 
     ({ data } = await getMappingsEditorData());
 
+    let updatedMappings: any = {
+      ...defaultMappings,
+      properties: {
+        myField: {
+          ...defaultMappings.properties.myField,
+          ...defaultTextParameters,
+        },
+      },
+    };
     expect(data).toEqual(updatedMappings);
 
     // Re-open the edit panel

diff --git a/...plication/components/mappings_editor/__jest__/client_integration/mappings_editor.test.tsx b/...plication/components/mappings_editor/__jest__/client_integration/mappings_editor.test.tsx
@@ -5,7 +5,7 @@
  */
 import { act } from 'react-dom/test-utils';
 
-import { componentHelpers, MappingsEditorTestBed, nextTick, getRandomString } from './helpers';
+import { componentHelpers, MappingsEditorTestBed, nextTick } from './helpers';
 
 const { setup, getMappingsEditorDataFactory } = componentHelpers.mappingsEditor;
 const onChangeHandler = jest.fn();
@@ -322,7 +322,7 @@ describe('Mappings editor: core', () => {
       /**
        * Mapped fields
        */
-      const newField = { name: getRandomString(), type: 'text' };
+      const newField = { name: 'someNewField', type: 'text' };
       updatedMappings = {
         ...updatedMappings,
         properties: {

diff --git a/.../plugins/index_management/public/application/components/mappings_editor/lib/utils.test.ts b/.../plugins/index_management/public/application/components/mappings_editor/lib/utils.test.ts
@@ -74,6 +74,8 @@ describe('utils', () => {
         someArray: [1, 2, 3],
         someEmptyObject: {},
         someDate: myDate,
+        falsey1: 0,
+        falsey2: '',
         stripThis: undefined,
         nested: {
           value: 'bar',
@@ -92,6 +94,8 @@ describe('utils', () => {
         someArray: [1, 2, 3],
         someEmptyObject: {},
         someDate: myDate,
+        falsey1: 0,
+        falsey2: '',
         nested: {
           value: 'bar',
           deepNested: {