Adding additional test

elastic · Sep 28, 2020 · 3f8295d · 3f8295d
1 parent 4afbb56
commit 3f8295d
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 16 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/epm.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/epm.ts
@@ -71,7 +71,7 @@ export interface InstallPackageResponse {
   response: AssetReference[];
 }
 
-export interface IBulkInstallPackageError {
+export interface IBulkInstallPackageHTTPError {
   name: string;
   statusCode: number;
   error: string | Error;
@@ -86,7 +86,7 @@ export interface BulkInstallPackageInfo {
 }
 
 export interface BulkInstallPackagesResponse {
-  response: Array<BulkInstallPackageInfo | IBulkInstallPackageError>;
+  response: Array<BulkInstallPackageInfo | IBulkInstallPackageHTTPError>;
 }
 
 export interface BulkInstallPackagesRequest {

diff --git a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts
@@ -15,7 +15,7 @@ import {
   GetLimitedPackagesResponse,
   BulkInstallPackageInfo,
   BulkInstallPackagesResponse,
-  IBulkInstallPackageError,
+  IBulkInstallPackageHTTPError,
 } from '../../../common';
 import {
   GetCategoriesRequestSchema,
@@ -175,7 +175,7 @@ export const installPackageFromRegistryHandler: RequestHandler<
 
 const bulkInstallServiceResponseToHttpEntry = (
   result: BulkInstallResponse
-): BulkInstallPackageInfo | IBulkInstallPackageError => {
+): BulkInstallPackageInfo | IBulkInstallPackageHTTPError => {
   if (isBulkInstallError(result)) {
     const { statusCode, body } = ingestErrorToResponseOptions(result.error);
     return {

diff --git a/...ins/ingest_manager/server/services/epm/packages/ensure_installed_default_packages.test.ts b/...ins/ingest_manager/server/services/epm/packages/ensure_installed_default_packages.test.ts
@@ -5,18 +5,18 @@
  */
 
 import { ElasticsearchAssetType, Installation, KibanaAssetType } from '../../../types';
-import { SavedObject } from 'src/core/server';
+import { SavedObject, SavedObjectsClientContract } from 'src/core/server';
 
 jest.mock('./install');
 jest.mock('./bulk_install_packages');
-jest.mock('./get', () => ({
-  ...(jest.requireActual('./get') as {}),
-  getInstallation: jest.fn(async () => {
-    return mockInstallation.attributes;
-  }),
-}));
-import { bulkInstallPackages } from './bulk_install_packages';
+jest.mock('./get');
+
+import { bulkInstallPackages, isBulkInstallError } from './bulk_install_packages';
 const { ensureInstalledDefaultPackages } = jest.requireActual('./install');
+const { isBulkInstallError: actualIsBulkInstallError } = jest.requireActual(
+  './bulk_install_packages'
+);
+import { getInstallation } from './get';
 import { savedObjectsClientMock } from 'src/core/server/mocks';
 import { appContextService } from '../../app_context';
 import { createAppContextStartContractMock } from '../../../mocks';
@@ -26,6 +26,14 @@ import { createAppContextStartContractMock } from '../../../mocks';
 const mockedBulkInstallPackages = bulkInstallPackages as jest.MockedFunction<
   typeof bulkInstallPackages
 >;
+const mockedIsBulkInstallError = isBulkInstallError as jest.MockedFunction<
+  typeof isBulkInstallError
+>;
+const mockedGetInstallation = getInstallation as jest.MockedFunction<typeof getInstallation>;
+
+// I was unable to get the actual implementation set in the `jest.mock()` call at the top to work
+// so this will set the `isBulkInstallError` function back to the actual implementation
+mockedIsBulkInstallError.mockImplementation(actualIsBulkInstallError);
 
 const mockInstallation: SavedObject<Installation> = {
   id: 'test-pkg',
@@ -36,7 +44,7 @@ const mockInstallation: SavedObject<Installation> = {
     installed_kibana: [{ type: KibanaAssetType.dashboard, id: 'dashboard-1' }],
     installed_es: [{ type: ElasticsearchAssetType.ingestPipeline, id: 'pipeline' }],
     es_index_patterns: { pattern: 'pattern-name' },
-    name: 'test packagek',
+    name: 'test package',
     version: '1.0.0',
     install_status: 'installed',
     install_version: '1.0.0',
@@ -45,30 +53,37 @@ const mockInstallation: SavedObject<Installation> = {
 };
 
 describe('ensureInstalledDefaultPackages', () => {
+  let soClient: jest.Mocked<SavedObjectsClientContract>;
   beforeEach(async () => {
+    soClient = savedObjectsClientMock.create();
     appContextService.start(createAppContextStartContractMock());
   });
   afterEach(async () => {
     appContextService.stop();
   });
   it('should return an array of Installation objects when successful', async () => {
+    mockedGetInstallation.mockImplementation(async () => {
+      return mockInstallation.attributes;
+    });
     mockedBulkInstallPackages.mockImplementationOnce(async function () {
       return [
         {
-          name: 'blah',
+          name: mockInstallation.attributes.name,
           assets: [],
           newVersion: '',
           oldVersion: '',
           statusCode: 200,
         },
       ];
     });
-    const soClient = savedObjectsClientMock.create();
     const resp = await ensureInstalledDefaultPackages(soClient, jest.fn());
     expect(resp).toEqual([mockInstallation.attributes]);
   });
   it('should throw the first Error it finds', async () => {
     class SomeCustomError extends Error {}
+    mockedGetInstallation.mockImplementation(async () => {
+      return mockInstallation.attributes;
+    });
     mockedBulkInstallPackages.mockImplementationOnce(async function () {
       return [
         {
@@ -102,9 +117,28 @@ describe('ensureInstalledDefaultPackages', () => {
         },
       ];
     });
-    const soClient = savedObjectsClientMock.create();
     const installPromise = ensureInstalledDefaultPackages(soClient, jest.fn());
+    expect.assertions(2);
     expect(installPromise).rejects.toThrow(SomeCustomError);
     expect(installPromise).rejects.toThrow('abc 123');
   });
+  it('should throw an error when get installation returns undefined', async () => {
+    mockedGetInstallation.mockImplementation(async () => {
+      return undefined;
+    });
+    mockedBulkInstallPackages.mockImplementationOnce(async function () {
+      return [
+        {
+          name: 'undefined package',
+          assets: [],
+          newVersion: '',
+          oldVersion: '',
+          statusCode: 200,
+        },
+      ];
+    });
+    const installPromise = ensureInstalledDefaultPackages(soClient, jest.fn());
+    expect.assertions(1);
+    expect(installPromise).rejects.toThrow();
+  });
 });