fix: Tests

Author: HazAT

packages/browser/src/backend.ts

@@ -41,7 +41,7 @@ export class BrowserBackend implements Backend {
   private transport?: Transport;
 
   /** A simple queue holding all requests. */
-  private queue: Queue<SentryResponse> = new Queue();
+  private readonly queue: Queue<SentryResponse> = new Queue();
 
   /**
    * @inheritDoc
@@ -184,7 +184,7 @@ export class BrowserBackend implements Backend {
   /**
    * @inheritDoc
    */
-  public close(timeout?: number): Promise<boolean> {
+  public async close(timeout?: number): Promise<boolean> {
     return this.queue.drain(timeout);
   }
 }

packages/core/src/base.ts

@@ -314,7 +314,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
   /**
    * @inheritDoc
    */
-  public close(timeout?: number): Promise<boolean> {
+  public async close(timeout?: number): Promise<boolean> {
     return this.backend.close(timeout);
   }
 }

packages/core/src/queue.ts

@@ -1,18 +1,35 @@
+/** A simple queue that holds promises. */
 export class Queue<T> {
-  private queue: Set<Promise<T>> = new Set();
+  /** Internal set of queued Promises */
+  private readonly queue: Set<Promise<T>> = new Set();
 
-  public add(task: Promise<T>): Promise<T> {
+  /**
+   * Add a promise to the queue.
+   *
+   * @param task Can be any Promise<T>
+   * @returns The original promise.
+   */
+  public async add(task: Promise<T>): Promise<T> {
     this.queue.add(task);
     task.then(() => this.queue.delete(task)).catch(() => this.queue.delete(task));
     return task;
   }
 
+  /**
+   * This function returns the number of unresolved promises in the queue.
+   */
   public length(): number {
     return this.queue.size;
   }
 
-  public drain(timeout?: number): Promise<boolean> {
-    return new Promise(resolve => {
+  /**
+   * This will drain the whole queue, returns true if queue is empty or drained.
+   * If timeout is provided and the queue takes longer to drain, the promise still resolves but with false.
+   *
+   * @param timeout Number in ms to wait until it resolves with false.
+   */
+  public async drain(timeout?: number): Promise<boolean> {
+    return new Promise<boolean>(resolve => {
       const capturedSetTimeout = setTimeout(() => {
         if (timeout && timeout > 0) {
           resolve(false);

packages/core/test/lib/queue.test.ts

@@ -1,5 +1,7 @@
 import { Queue } from '../../src/queue';
 
+// tslint:disable:no-floating-promises
+
 describe('Queue', () => {
   beforeEach(() => {
     jest.useFakeTimers();
@@ -70,4 +72,15 @@ describe('Queue', () => {
     });
     jest.runAllTimers();
   });
+
+  test('drain() on empty queue', async () => {
+    expect.assertions(3);
+    const q = new Queue<void>();
+    expect(q.length()).toBe(0);
+    q.drain().then(result => {
+      expect(result).toBeTruthy();
+      expect(q.length()).toBe(0);
+    });
+    jest.runAllTimers();
+  });
 });

packages/node/src/backend.ts

@@ -28,7 +28,7 @@ export class NodeBackend implements Backend {
   private transport?: Transport;
 
   /** A simple queue holding all requests. */
-  private queue: Queue<SentryResponse> = new Queue();
+  private readonly queue: Queue<SentryResponse> = new Queue();
 
   /**
    * @inheritDoc
@@ -128,7 +128,7 @@ export class NodeBackend implements Backend {
   /**
    * @inheritDoc
    */
-  public close(timeout?: number): Promise<boolean> {
+  public async close(timeout?: number): Promise<boolean> {
     return this.queue.drain(timeout);
   }
 }

packages/node/test/index.test.ts

@@ -58,10 +58,15 @@ describe('SentryNode', () => {
     captureMessage('test');
     captureMessage('test');
     captureMessage('test');
-    client.close(50).then(result => {
-      expect(result).toBeFalsy();
-      done();
-    });
+    client
+      .close(50)
+      .then(result => {
+        expect(result).toBeFalsy();
+        done();
+      })
+      .catch(() => {
+        // test
+      });
     jest.runAllTimers();
     getCurrentHub().popScope();
   });
@@ -79,10 +84,15 @@ describe('SentryNode', () => {
     captureMessage('test');
     captureMessage('test');
     jest.runAllTimers();
-    client.close(50).then(result => {
-      expect(result).toBeFalsy();
-      done();
-    });
+    client
+      .close(50)
+      .then(result => {
+        expect(result).toBeFalsy();
+        done();
+      })
+      .catch(() => {
+        // test
+      });
     jest.runAllTimers();
     getCurrentHub().popScope();
   });