fix test with initialization

elastic · Jul 13, 2020 · 6a5ffab · 6a5ffab
1 parent d8db793
commit 6a5ffab
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 28 deletions.
diff --git a/x-pack/plugins/event_log/server/es/context.mock.ts b/x-pack/plugins/event_log/server/es/context.mock.ts
@@ -17,7 +17,7 @@ const createContextMock = () => {
     logger: loggingSystemMock.createLogger(),
     esNames: namesMock.create(),
     initialize: jest.fn(),
-    waitTillReady: jest.fn(),
+    waitTillReady: jest.fn(async () => Promise.resolve(true)),
     esAdapter: clusterClientAdapterMock.create(),
     initialized: true,
   };

diff --git a/x-pack/plugins/event_log/server/event_logger.test.ts b/x-pack/plugins/event_log/server/event_logger.test.ts
@@ -14,6 +14,7 @@ import { delay } from './lib/delay';
 import { EVENT_LOGGED_PREFIX } from './event_logger';
 
 const KIBANA_SERVER_UUID = '424-24-2424';
+const WRITE_LOG_WAIT_MILLIS = 3000;
 
 describe('EventLogger', () => {
   let systemLogger: ReturnType<typeof loggingSystemMock.createLogger>;
@@ -22,17 +23,43 @@ describe('EventLogger', () => {
   let eventLogger: IEventLogger;
 
   beforeEach(() => {
+    jest.resetAllMocks();
     systemLogger = loggingSystemMock.createLogger();
     esContext = contextMock.create();
     service = new EventLogService({
       esContext,
       systemLogger,
-      config: { enabled: true, logEntries: true, indexEntries: false },
+      config: { enabled: true, logEntries: true, indexEntries: true },
       kibanaUUID: KIBANA_SERVER_UUID,
     });
     eventLogger = service.getLogger({});
   });
 
+  test('handles successful initialization', async () => {
+    service.registerProviderActions('test-provider', ['test-action-1']);
+    eventLogger = service.getLogger({
+      event: { provider: 'test-provider', action: 'test-action-1' },
+    });
+
+    eventLogger.logEvent({});
+    await waitForLogEvent(systemLogger);
+    delay(WRITE_LOG_WAIT_MILLIS); // sleep a bit since event logging is async
+    expect(esContext.esAdapter.indexDocument).toHaveBeenCalled();
+  });
+
+  test('handles failed initialization', async () => {
+    service.registerProviderActions('test-provider', ['test-action-1']);
+    eventLogger = service.getLogger({
+      event: { provider: 'test-provider', action: 'test-action-1' },
+    });
+    esContext.waitTillReady.mockImplementation(async () => Promise.resolve(false));
+
+    eventLogger.logEvent({});
+    await waitForLogEvent(systemLogger);
+    delay(WRITE_LOG_WAIT_MILLIS); // sleep a bit longer since event logging is async
+    expect(esContext.esAdapter.indexDocument).not.toHaveBeenCalled();
+  });
+
   test('method logEvent() writes expected default values', async () => {
     service.registerProviderActions('test-provider', ['test-action-1']);
     eventLogger = service.getLogger({
@@ -179,32 +206,6 @@ describe('EventLogger', () => {
     message = await waitForLogMessage(systemLogger);
     expect(message).toMatch(/invalid rel property.*ZZZ-primary.*/);
   });
-
-  test('handles failed but not thrown initialization', async () => {
-    esContext.waitTillReady.mockResolvedValueOnce(false);
-
-    service.registerProviderActions('test-provider', ['test-action-1']);
-    eventLogger = service.getLogger({
-      event: { provider: 'test-provider', action: 'test-action-1' },
-    });
-
-    eventLogger.logEvent({});
-    delay(3000); // sleep a bit since event logging is async
-    expect(esContext.esAdapter.indexDocument).not.toHaveBeenCalled();
-  });
-
-  test('handles failed thrown initialization', async () => {
-    esContext.waitTillReady.mockRejectedValueOnce(new Error('oof'));
-
-    service.registerProviderActions('test-provider', ['test-action-1']);
-    eventLogger = service.getLogger({
-      event: { provider: 'test-provider', action: 'test-action-1' },
-    });
-
-    eventLogger.logEvent({});
-    delay(3000); // sleep a bit since event logging is async
-    expect(esContext.esAdapter.indexDocument).not.toHaveBeenCalled();
-  });
 });
 
 // return the next logged event; throw if not an event