fix jest tests

elastic · Jan 22, 2020 · 93b46ec · 93b46ec
1 parent ab60604
commit 93b46ec
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
@@ -57,6 +57,8 @@ beforeEach(() => {
 
 afterEach(() => generatePngObservableFactory.mockReset());
 
+const getMockLogger = () => new LevelLogger();
+
 const encryptHeaders = async headers => {
   const crypto = cryptoFactory(mockServer);
   return await crypto.encrypt(headers);
@@ -68,7 +70,7 @@ test(`passes browserTimezone to generatePng`, async () => {
   const generatePngObservable = generatePngObservableFactory();
   generatePngObservable.mockReturnValue(Rx.of(Buffer.from('')));
 
-  const executeJob = executeJobFactory(mockServer, { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
   const browserTimezone = 'UTC';
   await executeJob(
     'pngJobId',
@@ -86,7 +88,7 @@ test(`passes browserTimezone to generatePng`, async () => {
 });
 
 test(`returns content_type of application/png`, async () => {
-  const executeJob = executeJobFactory(mockServer, { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePngObservable = generatePngObservableFactory();
@@ -106,7 +108,7 @@ test(`returns content of generatePng getBuffer base64 encoded`, async () => {
   const generatePngObservable = generatePngObservableFactory();
   generatePngObservable.mockReturnValue(Rx.of(Buffer.from(testContent)));
 
-  const executeJob = executeJobFactory(mockServer, { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pngJobId',

diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
@@ -57,6 +57,8 @@ beforeEach(() => {
 
 afterEach(() => generatePdfObservableFactory.mockReset());
 
+const getMockLogger = () => new LevelLogger();
+
 const encryptHeaders = async headers => {
   const crypto = cryptoFactory(mockServer);
   return await crypto.encrypt(headers);
@@ -68,7 +70,7 @@ test(`passes browserTimezone to generatePdf`, async () => {
   const generatePdfObservable = generatePdfObservableFactory();
   generatePdfObservable.mockReturnValue(Rx.of(Buffer.from('')));
 
-  const executeJob = executeJobFactory(mockServer, { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
   const browserTimezone = 'UTC';
   await executeJob(
     'pdfJobId',
@@ -89,7 +91,7 @@ test(`passes browserTimezone to generatePdf`, async () => {
 });
 
 test(`returns content_type of application/pdf`, async () => {
-  const executeJob = executeJobFactory(mockServer, { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
   const encryptedHeaders = await encryptHeaders({});
 
   const generatePdfObservable = generatePdfObservableFactory();
@@ -109,7 +111,7 @@ test(`returns content of generatePdf getBuffer base64 encoded`, async () => {
   const generatePdfObservable = generatePdfObservableFactory();
   generatePdfObservable.mockReturnValue(Rx.of(Buffer.from(testContent)));
 
-  const executeJob = executeJobFactory(mockServer, { browserDriverFactory: {} });
+  const executeJob = executeJobFactory(mockServer, getMockLogger(), { browserDriverFactory: {} });
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pdfJobId',

diff --git a/...sts__/authorized_user_pre_routing.test.js → ...s/lib/authorized_user_pre_routing.test.js b/...sts__/authorized_user_pre_routing.test.js → ...s/lib/authorized_user_pre_routing.test.js
@@ -5,28 +5,26 @@
  */
 
 import expect from '@kbn/expect';
-import sinon from 'sinon';
-import { authorizedUserPreRoutingFactory } from '../authorized_user_pre_routing';
+import { authorizedUserPreRoutingFactory } from './authorized_user_pre_routing';
 
 describe('authorized_user_pre_routing', function() {
   // the getClientShield is using `once` which forces us to use a constant mock
   // which makes testing anything that is dependent on `oncePerServer` confusing.
   // so createMockServer reuses the same 'instance' of the server and overwrites
   // the properties to contain different values
   const createMockServer = (function() {
-    const getUserStub = sinon.stub();
+    const getUserStub = jest.fn();
     let mockConfig;
 
     const mockServer = {
-      expose: function() {},
-      config: function() {
+      expose() {},
+      config() {
         return {
-          get: function(key) {
+          get(key) {
             return mockConfig[key];
           },
         };
       },
-      log: function() {},
       plugins: {
         xpack_main: {},
         security: { getUser: getUserStub },
@@ -45,7 +43,7 @@ describe('authorized_user_pre_routing', function() {
       mockServer.plugins.xpack_main = {
         info: !xpackInfoUndefined && {
           isAvailable: () => xpackInfoAvailable,
-          feature: function(featureName) {
+          feature(featureName) {
             if (featureName === 'security') {
               return {
                 isEnabled: () => securityEnabled,
@@ -56,25 +54,26 @@ describe('authorized_user_pre_routing', function() {
         },
       };
 
-      getUserStub.resetHistory();
-      getUserStub.resolves(user);
+      getUserStub.mockReset();
+      getUserStub.mockResolvedValue(user);
       return mockServer;
     };
   })();
+  const getMockLogger = () => ({ warn: jest.fn() });
 
   it('should return with boom notFound when xpackInfo is undefined', async function() {
     const mockServer = createMockServer({ xpackInfoUndefined: true });
 
-    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer);
-    const response = await authorizedUserPreRouting();
+    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer, getMockLogger());
+    const response = await authorizedUserPreRouting({});
     expect(response.isBoom).to.be(true);
     expect(response.output.statusCode).to.be(404);
   });
 
   it(`should return with boom notFound when xpackInfo isn't available`, async function() {
     const mockServer = createMockServer({ xpackInfoAvailable: false });
 
-    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer);
+    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer, getMockLogger());
     const response = await authorizedUserPreRouting();
     expect(response.isBoom).to.be(true);
     expect(response.output.statusCode).to.be(404);
@@ -83,15 +82,15 @@ describe('authorized_user_pre_routing', function() {
   it('should return with null user when security is disabled in Elasticsearch', async function() {
     const mockServer = createMockServer({ securityEnabled: false });
 
-    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer);
+    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer, getMockLogger());
     const response = await authorizedUserPreRouting();
     expect(response).to.be(null);
   });
 
   it('should return with boom unauthenticated when security is enabled but no authenticated user', async function() {
     const mockServer = createMockServer({ user: null });
 
-    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer);
+    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer, getMockLogger());
     const response = await authorizedUserPreRouting();
     expect(response.isBoom).to.be(true);
     expect(response.output.statusCode).to.be(401);
@@ -103,7 +102,7 @@ describe('authorized_user_pre_routing', function() {
       config: { 'xpack.reporting.roles.allow': ['.reporting_user'] },
     });
 
-    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer);
+    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer, getMockLogger());
     const response = await authorizedUserPreRouting();
     expect(response.isBoom).to.be(true);
     expect(response.output.statusCode).to.be(403);
@@ -116,7 +115,7 @@ describe('authorized_user_pre_routing', function() {
       config: { 'xpack.reporting.roles.allow': ['.reporting_user'] },
     });
 
-    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer);
+    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer, getMockLogger());
     const response = await authorizedUserPreRouting();
     expect(response).to.be(user);
   });
@@ -128,7 +127,7 @@ describe('authorized_user_pre_routing', function() {
       config: { 'xpack.reporting.roles.allow': [] },
     });
 
-    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer);
+    const authorizedUserPreRouting = authorizedUserPreRoutingFactory(mockServer, getMockLogger());
     const response = await authorizedUserPreRouting();
     expect(response).to.be(user);
   });