fix tests

elastic · Apr 6, 2020 · 732e990 · 732e990
1 parent 37b8510
commit 732e990
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 29 deletions.
diff --git a/...ement/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js b/...ement/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js
@@ -519,7 +519,8 @@ describe('Flyout', () => {
       expect(resolveIndexPatternConflicts).toHaveBeenCalledWith(
         component.instance().resolutions,
         mockConflictedIndexPatterns,
-        true
+        true,
+        defaultProps.indexPatterns
       );
       expect(saveObjects).toHaveBeenCalledWith(
         mockConflictedSavedObjectsLinkedToSavedSearches,

diff --git a/src/legacy/ui/public/new_platform/set_services.ts b/src/legacy/ui/public/new_platform/set_services.ts
@@ -72,6 +72,7 @@ export function setStartServices(npStart: NpStart) {
   visualizationsServices.setAggs(npStart.plugins.data.search.aggs);
   visualizationsServices.setOverlays(npStart.core.overlays);
   visualizationsServices.setChrome(npStart.core.chrome);
+  visualizationsServices.setSearch(npStart.plugins.data.search);
   const savedVisualizationsLoader = createSavedVisLoader({
     savedObjectsClient: npStart.core.savedObjects.client,
     indexPatterns: npStart.plugins.data.indexPatterns,

diff --git a/src/plugins/saved_objects/public/saved_object/saved_object.test.ts b/src/plugins/saved_objects/public/saved_object/saved_object.test.ts
@@ -103,9 +103,11 @@ describe('Saved Object', () => {
   }
 
   beforeEach(() => {
+    (dataStartMock.search.parseSearchSource as jest.Mock).mockReset();
     SavedObjectClass = createSavedObjectClass({
       savedObjectsClient: savedObjectsClientStub,
       indexPatterns: dataStartMock.indexPatterns,
+      search: dataStartMock.search,
     } as SavedObjectKibanaServices);
   });
 
@@ -269,7 +271,7 @@ describe('Saved Object', () => {
         );
       });
 
-      it('when index exists in searchSourceJSON', () => {
+      it('when search source references saved object', () => {
         const id = '123';
         stubESResponse(getMockedDocResponse(id));
         return createInitializedSavedObject({ type: 'dashboard', searchSource: true }).then(
@@ -409,18 +411,17 @@ describe('Saved Object', () => {
       });
     });
 
-    it('throws error invalid JSON is detected', async () => {
+    it('forwards thrown exceptions from parseSearchSource', async () => {
+      (dataStartMock.search.parseSearchSource as jest.Mock).mockImplementation(() => {
+        throw new InvalidJSONProperty('');
+      });
       const savedObject = await createInitializedSavedObject({
         type: 'dashboard',
         searchSource: true,
       });
       const response = {
         found: true,
-        _source: {
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: '"{\\n  \\"filter\\": []\\n}"',
-          },
-        },
+        _source: {},
       };
 
       try {
@@ -586,23 +587,24 @@ describe('Saved Object', () => {
         });
     });
 
-    it('injects references from searchSourceJSON', async () => {
+    it('passes references to search source parsing function', async () => {
       const savedObject = new SavedObjectClass({ type: 'dashboard', searchSource: true });
       return savedObject.init!().then(() => {
+        const searchSourceJSON = JSON.stringify({
+          indexRefName: 'kibanaSavedObjectMeta.searchSourceJSON.index',
+          filter: [
+            {
+              meta: {
+                indexRefName: 'kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index',
+              },
+            },
+          ],
+        });
         const response = {
           found: true,
           _source: {
             kibanaSavedObjectMeta: {
-              searchSourceJSON: JSON.stringify({
-                indexRefName: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-                filter: [
-                  {
-                    meta: {
-                      indexRefName: 'kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index',
-                    },
-                  },
-                ],
-              }),
+              searchSourceJSON,
             },
           },
           references: [
@@ -619,16 +621,10 @@ describe('Saved Object', () => {
           ],
         };
         savedObject.applyESResp(response);
-        expect(savedObject.searchSource!.getFields()).toEqual({
-          index: 'my-index-1',
-          filter: [
-            {
-              meta: {
-                index: 'my-index-2',
-              },
-            },
-          ],
-        });
+        expect(dataStartMock.search.parseSearchSource).toBeCalledWith(
+          searchSourceJSON,
+          response.references
+        );
       });
     });
   });