Fixed tests

elastic · Apr 7, 2020 · 497dfa2 · 497dfa2
1 parent 359984e
commit 497dfa2
Show file tree

Hide file tree

Showing 31 changed files with 304 additions and 106 deletions.
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -430,9 +430,16 @@ export const npStart = {
         aggs: {
           calculateAutoTimeExpression: sinon.fake(),
           createAggConfigs: (indexPattern, configStates = []) => {
-            return new AggConfigs(indexPattern, configStates, {
-              typesRegistry: aggTypesRegistry.start(),
-            });
+            return new AggConfigs(
+              indexPattern,
+              configStates,
+              {
+                typesRegistry: aggTypesRegistry.start(),
+              },
+              {
+                fieldFormats: getFieldFormatsRegistry(mockCoreStart),
+              }
+            );
           },
           types: aggTypesRegistry.start(),
         },

diff --git a/src/plugins/data/public/search/aggs/agg_config.test.ts b/src/plugins/data/public/search/aggs/agg_config.test.ts
@@ -20,16 +20,20 @@
 import { identity } from 'lodash';
 
 import { AggConfig, IAggConfig } from './agg_config';
-import { AggConfigs, CreateAggConfigParams } from './agg_configs';
+import { AggConfigs, CreateAggConfigParams, AggConfigsDependencies } from './agg_configs';
 import { AggType } from './agg_type';
 import { AggTypesRegistryStart } from './agg_types_registry';
 import { mockDataServices, mockAggTypesRegistry } from './test_helpers';
 import { Field as IndexPatternField, IndexPattern } from '../../index_patterns';
 import { stubIndexPatternWithFields } from '../../../public/stubs';
+import { fieldFormatsServiceMock } from '../../field_formats/mocks';
 
 describe('AggConfig', () => {
   let indexPattern: IndexPattern;
   let typesRegistry: AggTypesRegistryStart;
+  const aggConfigsDependencies: AggConfigsDependencies = {
+    fieldFormats: fieldFormatsServiceMock.createStartContract(),
+  };
 
   beforeEach(() => {
     jest.restoreAllMocks();
@@ -40,7 +44,7 @@ describe('AggConfig', () => {
 
   describe('#toDsl', () => {
     it('calls #write()', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry }, aggConfigsDependencies);
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -55,7 +59,7 @@ describe('AggConfig', () => {
     });
 
     it('uses the type name as the agg name', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry }, aggConfigsDependencies);
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -70,7 +74,7 @@ describe('AggConfig', () => {
     });
 
     it('uses the params from #write() output as the agg params', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry }, aggConfigsDependencies);
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -100,7 +104,12 @@ describe('AggConfig', () => {
           params: {},
         },
       ];
-      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
+      const ac = new AggConfigs(
+        indexPattern,
+        configStates,
+        { typesRegistry },
+        aggConfigsDependencies
+      );
 
       const histoConfig = ac.byName('date_histogram')[0];
       const avgConfig = ac.byName('avg')[0];
@@ -210,8 +219,18 @@ describe('AggConfig', () => {
 
     testsIdentical.forEach((configState, index) => {
       it(`identical aggregations (${index})`, () => {
-        const ac1 = new AggConfigs(indexPattern, configState, { typesRegistry });
-        const ac2 = new AggConfigs(indexPattern, configState, { typesRegistry });
+        const ac1 = new AggConfigs(
+          indexPattern,
+          configState,
+          { typesRegistry },
+          aggConfigsDependencies
+        );
+        const ac2 = new AggConfigs(
+          indexPattern,
+          configState,
+          { typesRegistry },
+          aggConfigsDependencies
+        );
         expect(ac1.jsonDataEquals(ac2.aggs)).toBe(true);
       });
     });
@@ -251,8 +270,18 @@ describe('AggConfig', () => {
 
     testsIdenticalDifferentOrder.forEach((test, index) => {
       it(`identical aggregations (${index}) - init json is in different order`, () => {
-        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry });
-        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry });
+        const ac1 = new AggConfigs(
+          indexPattern,
+          test.config1,
+          { typesRegistry },
+          aggConfigsDependencies
+        );
+        const ac2 = new AggConfigs(
+          indexPattern,
+          test.config2,
+          { typesRegistry },
+          aggConfigsDependencies
+        );
         expect(ac1.jsonDataEquals(ac2.aggs)).toBe(true);
       });
     });
@@ -316,16 +345,26 @@ describe('AggConfig', () => {
 
     testsDifferent.forEach((test, index) => {
       it(`different aggregations (${index})`, () => {
-        const ac1 = new AggConfigs(indexPattern, test.config1, { typesRegistry });
-        const ac2 = new AggConfigs(indexPattern, test.config2, { typesRegistry });
+        const ac1 = new AggConfigs(
+          indexPattern,
+          test.config1,
+          { typesRegistry },
+          aggConfigsDependencies
+        );
+        const ac2 = new AggConfigs(
+          indexPattern,
+          test.config2,
+          { typesRegistry },
+          aggConfigsDependencies
+        );
         expect(ac1.jsonDataEquals(ac2.aggs)).toBe(false);
       });
     });
   });
 
   describe('#toJSON', () => {
     it('includes the aggs id, params, type and schema', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry }, aggConfigsDependencies);
       const configStates = {
         enabled: true,
         type: 'date_histogram',
@@ -356,8 +395,18 @@ describe('AggConfig', () => {
           params: {},
         },
       ];
-      const ac1 = new AggConfigs(indexPattern, configStates, { typesRegistry });
-      const ac2 = new AggConfigs(indexPattern, configStates, { typesRegistry });
+      const ac1 = new AggConfigs(
+        indexPattern,
+        configStates,
+        { typesRegistry },
+        aggConfigsDependencies
+      );
+      const ac2 = new AggConfigs(
+        indexPattern,
+        configStates,
+        { typesRegistry },
+        aggConfigsDependencies
+      );
 
       // this relies on the assumption that js-engines consistently loop over properties in insertion order.
       // most likely the case, but strictly speaking not guaranteed by the JS and JSON specifications.
@@ -369,7 +418,7 @@ describe('AggConfig', () => {
     let aggConfig: AggConfig;
 
     beforeEach(() => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry }, aggConfigsDependencies);
       aggConfig = ac.createAggConfig({ type: 'count' } as CreateAggConfigParams);
     });
 
@@ -398,7 +447,7 @@ describe('AggConfig', () => {
 
   describe('#fieldFormatter - custom getFormat handler', () => {
     it('returns formatter from getFormat handler', () => {
-      const ac = new AggConfigs(indexPattern, [], { typesRegistry });
+      const ac = new AggConfigs(indexPattern, [], { typesRegistry }, aggConfigsDependencies);
       const configStates = {
         enabled: true,
         type: 'count',
@@ -439,7 +488,12 @@ describe('AggConfig', () => {
           },
         },
       };
-      const ac = new AggConfigs(indexPattern, [configStates], { typesRegistry });
+      const ac = new AggConfigs(
+        indexPattern,
+        [configStates],
+        { typesRegistry },
+        aggConfigsDependencies
+      );
       aggConfig = ac.createAggConfig(configStates);
     });
 

diff --git a/src/plugins/data/public/search/aggs/agg_config.ts b/src/plugins/data/public/search/aggs/agg_config.ts
@@ -25,7 +25,6 @@ import { IAggConfigs } from './agg_configs';
 import { FetchOptions } from '../fetch';
 import { ISearchSource } from '../search_source';
 import { FieldFormatsContentType, KBN_FIELD_TYPES } from '../../../common';
-import { getFieldFormats } from '../../../public/services';
 import { FieldFormatsStart } from '../../field_formats';
 
 export interface AggConfigOptions {
@@ -40,12 +39,6 @@ export interface AggConfigDependencies {
   fieldFormats: FieldFormatsStart;
 }
 
-const tempAggConfigDependencies = () => {
-  return {
-    fieldFormats: getFieldFormats(),
-  };
-};
-
 /**
  * @name AggConfig
  *
@@ -109,7 +102,7 @@ export class AggConfig {
   constructor(
     aggConfigs: IAggConfigs,
     opts: AggConfigOptions,
-    { fieldFormats }: AggConfigDependencies = tempAggConfigDependencies()
+    { fieldFormats }: AggConfigDependencies
   ) {
     this.aggConfigs = aggConfigs;
     this.id = String(opts.id || AggConfig.nextId(aggConfigs.aggs as any));