More test updates for new submission impl

Author: niemyjski

packages/core/src/submission/SubmissionClientBase.ts

@@ -26,7 +26,7 @@ export abstract class SubmissionClientBase implements ISubmissionClient {
   public async submitEvents(events: IEvent[]): Promise<Response<void>> {
     const url = `${this.config.serverUrl}/api/v2/events`;
     const response = await this.fetch<void>(url, {
-      method: 'GET',
+      method: 'POST',
       body: JSON.stringify(events)
     });
 

packages/core/test/ExceptionlessClient.test.ts

@@ -2,13 +2,10 @@
 
 import { Configuration } from "../src/configuration/Configuration.js";
 import { ExceptionlessClient } from "../src/ExceptionlessClient.js";
-import { EventPluginContext } from "../src/plugins/EventPluginContext.js";
-import { InMemorySubmissionAdapter } from "./submission/InMemorySubmissionAdapter.js";
 
 describe('ExceptionlessClient', () => {
   beforeEach(() => {
     Configuration.defaults.updateSettingsWhenIdleInterval = -1;
-    Configuration.defaults.submissionAdapter = new InMemorySubmissionAdapter();
   });
 
   test('should use event reference ids', async () => {

packages/core/test/plugins/EventPluginManager.test.ts

@@ -90,7 +90,7 @@ describe('EventPluginManager', () => {
     expect(context.cancelled).toBe(true);
   });
 
-  test('should cancel via timeout.', async done => {
+  test('should cancel via timeout.', async () => {
     const client = new ExceptionlessClient({
       apiKey: 'LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw',
       serverUrl: 'http://localhost:5000'

packages/core/test/plugins/default/DuplicateCheckerPlugin.test.ts

@@ -3,6 +3,7 @@ import { ExceptionlessClient } from "../../../src/ExceptionlessClient.js";
 import { EventPluginContext } from "../../../src/plugins/EventPluginContext.js";
 import { IInnerError } from "../../../src/models/IInnerError.js";
 import { IStackFrame } from "../../../src/models/IStackFrame.js";
+import { delay } from "../../../src/Utils.js";
 
 const Exception1StackTrace = [
   {
@@ -48,7 +49,7 @@ describe('DuplicateCheckerPlugin', () => {
     plugin = new DuplicateCheckerPlugin(() => now, 50);
   });
 
-  function run(stackTrace?: IStackFrame[]) {
+  function run(stackTrace?: IStackFrame[]): Promise<EventPluginContext> {
     // TODO: Generate unique stack traces based on test data.
     const context = new EventPluginContext(client, {
       type: 'error',
@@ -61,19 +62,19 @@ describe('DuplicateCheckerPlugin', () => {
       }
     });
 
-    plugin.run(context);
+    await plugin.run(context);
     return context;
   }
 
-  test('should ignore duplicate within window', done => {
+  test('should ignore duplicate within window', async () => {
     run(Exception1StackTrace);
 
     const contextOfSecondRun = run(Exception1StackTrace);
     expect(contextOfSecondRun.cancelled).toBe(true);
+    await delay(100);
     setTimeout(() => {
       expect(contextOfSecondRun.event.count).toBe(1);
 
-      done();
     }, 100);
   });
 

packages/core/test/queue/DefaultEventQueue.test.ts

@@ -1,16 +1,14 @@
 import { Configuration } from "../../src/configuration/Configuration.js";
 import { IEvent } from "../../src/models/IEvent.js";
-
-import { InMemorySubmissionAdapter } from "../submission/InMemorySubmissionAdapter.js";
+import { delay } from "../../src/Utils.js";
 
 describe('DefaultEventQueue', () => {
   let config: Configuration;
 
   beforeEach(() => {
     config = new Configuration({
       apiKey: 'LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw',
-      serverUrl: 'http://localhost:5000',
-      submissionAdapter: new InMemorySubmissionAdapter()
+      serverUrl: 'http://localhost:5000'
     });
 
     expect(config.storage.queue.get().length).toBe(0);
@@ -48,21 +46,18 @@ describe('DefaultEventQueue', () => {
     expect(config.storage.queue.get().length).toBe(0);
   });
 
-  test('should suspend processing', done => {
+  test('should suspend processing', async () => {
     config.queue.suspendProcessing(.0001);
 
     const event: IEvent = { type: 'log', reference_id: '123454321' };
     config.queue.enqueue(event);
     expect(config.storage.queue.get().length).toBe(1);
 
-    setTimeout(() => {
-      if (!(config.queue as any)._suspendProcessingUntil) {
-        expect(config.storage.queue.get().length).toBe(0);
-      } else {
-        expect(config.storage.queue.get().length).toBe(1);
-      }
-
-      done();
-    }, 25);
+    await delay(25);
+    if (!(config.queue as any)._suspendProcessingUntil) {
+      expect(config.storage.queue.get().length).toBe(0);
+    } else {
+      expect(config.storage.queue.get().length).toBe(1);
+    }
   });
 });

packages/core/test/submission/DefaultSubmissionClient.test.ts

@@ -0,0 +1,95 @@
+import { Configuration } from "../../src/configuration/Configuration.js";
+import { ClientSettings } from "../../src/configuration/SettingsManager.js";
+import { IEvent } from "../../src/models/IEvent.js";
+import { IUserDescription } from "../../src/models/IUserDescription.js";
+import { Response } from "../../src/submission/Response.js";
+import { TestSubmissionClient } from "./TestSubmissionClient.js"
+
+describe('TestSubmissionClient', () => {
+  const config: Configuration = new Configuration({
+    apiKey: 'LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw',
+    serverUrl: 'http://server.localhost:5000',
+    configServerUrl: 'http://config.localhost:5000',
+    heartbeatServerUrl: 'http://heartbeat.localhost:5000',
+  });
+
+  test('should submit events', async () => {
+    const fetchMock = TestSubmissionClient.prototype.fetch = jest.fn()
+      .mockReturnValueOnce(new Response<void>(202, '', -1, undefined));
+
+    const events = [{ type: 'log', message: 'From js client', reference_id: '123454321' }];
+    const client = new TestSubmissionClient(config);
+    await client.submitEvents(events);
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    expect(fetchMock.mock.calls[0][0]).toBe(`${config.serverUrl}/api/v2/events`);
+    expect(fetchMock.mock.calls[0][1]).toEqual({
+      method: 'POST',
+      body: JSON.stringify(events)
+    });
+  });
+
+  test('should submit invalid object data', async () => {
+    const fetchMock = TestSubmissionClient.prototype.fetch = jest.fn()
+      .mockReturnValueOnce(new Response<void>(202, '', -1, undefined));
+
+    const events: IEvent[] = [{
+      type: 'log', message: 'From js client', reference_id: '123454321', data: {
+        name: 'blake',
+        age: () => { throw new Error('Test'); }
+      }
+    }];
+
+    const client = new TestSubmissionClient(config);
+    await client.submitEvents(events);
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    expect(fetchMock.mock.calls[0][0]).toBe(`${config.serverUrl}/api/v2/events`);
+    expect(fetchMock.mock.calls[0][1]).toEqual({
+      method: 'POST',
+      body: JSON.stringify(events)
+    });
+  });
+
+  test('should submit user description', async () => {
+    const fetchMock = TestSubmissionClient.prototype.fetch = jest.fn()
+      .mockReturnValueOnce(new Response<void>(202, '', -1, undefined));
+
+    const description: IUserDescription = {
+      email_address: '[email protected]',
+      description: 'unit test'
+    };
+
+    const client = new TestSubmissionClient(config);
+    await client.submitUserDescription("123454321", description);
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    expect(fetchMock.mock.calls[0][0]).toBe(`${config.serverUrl}/api/v2/events/by-ref/123454321/user-description`);
+    expect(fetchMock.mock.calls[0][1]).toEqual({
+      method: 'POST',
+      body: JSON.stringify(description)
+    });
+  });
+
+  test('should submit heartbeat', async () => {
+    const fetchMock = TestSubmissionClient.prototype.fetch = jest.fn()
+      .mockReturnValueOnce(new Response<void>(200, '', 1, undefined))
+      .mockReturnValueOnce(new Response<ClientSettings>(200, '', 1, new ClientSettings({}, 1)));
+
+    const client = config.submissionClient = new TestSubmissionClient(config);
+    await client.submitHeartbeat('sessionId', true);
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+    expect(fetchMock.mock.calls[0][0]).toBe(`${config.heartbeatServerUrl}/api/v2/events/session/heartbeat?id=sessionId&close=true`);
+    expect(fetchMock.mock.calls[0][1]).toEqual({ method: 'GET' });
+    expect(fetchMock.mock.calls[1][0]).toBe(`${config.serverUrl}/api/v2/projects/config?v=0`);
+    expect(fetchMock.mock.calls[1][1]).toEqual({ method: 'GET' });
+  });
+
+  test('should get project settings', async () => {
+    const fetchMock = TestSubmissionClient.prototype.fetch = jest.fn()
+      .mockReturnValueOnce(new Response<ClientSettings>(200, '', undefined, new ClientSettings({}, 1)));
+
+    const client = new TestSubmissionClient(config);
+    await client.getSettings(0);
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    expect(fetchMock.mock.calls[0][0]).toBe(`${config.serverUrl}/api/v2/projects/config?v=0`);
+    expect(fetchMock.mock.calls[0][1]).toEqual({ method: 'GET' });
+  });
+});

packages/core/test/submission/InMemorySubmissionAdapter.ts

@@ -0,0 +1,11 @@
+import { Response } from "../../src/submission/Response.js";
+import {
+  FetchOptions,
+  SubmissionClientBase
+} from "../../src/submission/SubmissionClientBase.js";
+
+export class TestSubmissionClient extends SubmissionClientBase {
+  public fetch<T>(url: string, options: FetchOptions): Promise<Response<T>> {
+    throw new Error("Missing mock");
+  }
+}