fix tests

Author: tsullivan

x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts

@@ -152,7 +152,7 @@ describe('conditions', () => {
 
 test('uses basePath from job when creating saved object service', async () => {
   const mockGetSavedObjectsClient = jest.fn();
-  mockReportingPlugin.getSavedObjectsClient = jest.fn();
+  mockReportingPlugin.getSavedObjectsClient = mockGetSavedObjectsClient;
 
   const permittedHeaders = {
     foo: 'bar',

x-pack/legacy/plugins/reporting/server/index.ts

@@ -13,4 +13,4 @@ export const plugin = (context: PluginInitializerContext) => {
 
 export { ReportingCore } from './core';
 export { ReportingPlugin } from './plugin';
-export { ReportingSetupDeps, ReportingStartDeps } from './types';
+export { ReportingSetupDeps, ReportingStartDeps } from './types.d';

x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.test.js

@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as Rx from 'rxjs';
 import sinon from 'sinon';
+import { createMockReportingCore } from '../../test_helpers';
 import { getExportTypesRegistry } from '../lib/export_types_registry';
 import {
-  getReportingUsageCollector,
   registerReportingUsageCollector,
+  getReportingUsageCollector,
 } from './reporting_usage_collector';
 
 const exportTypesRegistry = getExportTypesRegistry();
@@ -415,20 +415,20 @@ describe('data modeling', () => {
 });
 
 describe('Ready for collection observable', () => {
+  let mockReporting;
+
+  beforeEach(async () => {
+    mockReporting = await createMockReportingCore();
+  });
+
   test('converts observable to promise', async () => {
     const serverWithBasicLicenseMock = getServerMock();
     const makeCollectorSpy = sinon.spy();
     const usageCollection = {
       makeUsageCollector: makeCollectorSpy,
       registerCollector: sinon.stub(),
     };
-    const start$ = Rx.of({ start: true });
-    registerReportingUsageCollector(
-      serverWithBasicLicenseMock,
-      usageCollection,
-      start$,
-      exportTypesRegistry
-    );
+    registerReportingUsageCollector(mockReporting, serverWithBasicLicenseMock, usageCollection);
 
     const [args] = makeCollectorSpy.firstCall.args;
     expect(args).toMatchInlineSnapshot(`

x-pack/legacy/plugins/reporting/server/usage/reporting_usage_collector.ts

@@ -7,23 +7,28 @@
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { KIBANA_REPORTING_TYPE } from '../../common/constants';
 import { ReportingCore } from '../../server';
-import { ESCallCluster, ServerFacade } from '../../types';
+import { ESCallCluster, ExportTypesRegistry, ServerFacade } from '../../types';
 import { getReportingUsage } from './get_reporting_usage';
 import { RangeStats } from './types';
 
 // places the reporting data as kibana stats
 const METATYPE = 'kibana_stats';
 
-export function registerReportingUsageCollector(
-  reporting: ReportingCore,
+/*
+ * @param {Object} server
+ * @return {Object} kibana usage stats type collection object
+ */
+export function getReportingUsageCollector(
   server: ServerFacade,
-  usageCollection: UsageCollectionSetup
+  usageCollection: UsageCollectionSetup,
+  exportTypesRegistry: ExportTypesRegistry,
+  isReady: () => Promise<boolean>
 ) {
-  const collector = usageCollection.makeUsageCollector({
+  return usageCollection.makeUsageCollector({
     type: KIBANA_REPORTING_TYPE,
     fetch: (callCluster: ESCallCluster) =>
-      getReportingUsage(server, callCluster, reporting.getExportTypesRegistry()),
-    isReady: reporting.pluginHasStarted,
+      getReportingUsage(server, callCluster, exportTypesRegistry),
+    isReady,
 
     /*
      * Format the response data into a model for internal upload
@@ -43,6 +48,21 @@ export function registerReportingUsageCollector(
       };
     },
   });
+}
+
+export function registerReportingUsageCollector(
+  reporting: ReportingCore,
+  server: ServerFacade,
+  usageCollection: UsageCollectionSetup
+) {
+  const exportTypesRegistry = reporting.getExportTypesRegistry();
+  const collectionIsReady = reporting.pluginHasStarted.bind(reporting);
 
+  const collector = getReportingUsageCollector(
+    server,
+    usageCollection,
+    exportTypesRegistry,
+    collectionIsReady
+  );
   usageCollection.registerCollector(collector);
 }