fix: Broken travis tests on master, Fix node tests

getsentry · Jul 5, 2018 · 5601a14 · 5601a14
1 parent 867c8b6
commit 5601a14
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/.travis/before_script.sh b/.travis/before_script.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 set -e
 
+if [[ $TRAVIS_BRANCH == 'master' ]]; then
+CHANGES="[force ci]"
+else
 CHANGES=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master))
+fi
 
 if [ -n "$(grep 'raven-js' <<< "$CHANGES")" ]; then
   RAVEN_JS_CHANGES=true

diff --git a/packages/hub/src/hub.ts b/packages/hub/src/hub.ts
@@ -38,7 +38,7 @@ export class Hub {
    * Internal helper function to call a method on the top client if it exists.
    *
    * @param method The method to call on the client/client.
-   * @param args Arguments to pass to the client/fontend.
+   * @param args Arguments to pass to the client/frontend.
    */
   private invokeClient(method: string, ...args: any[]): void {
     const top = this.getStackTop();
@@ -52,7 +52,7 @@ export class Hub {
    * exists.
    *
    * @param method The method to call on the client/client.
-   * @param args Arguments to pass to the client/fontend.
+   * @param args Arguments to pass to the client/frontend.
    */
   private invokeClientAsync(method: string, ...args: any[]): void {
     const top = this.getStackTop();

diff --git a/packages/node/test/index.test.ts b/packages/node/test/index.test.ts
@@ -118,6 +118,7 @@ describe('SentryNode', () => {
     });
 
     test('capture an exception', done => {
+      expect.assertions(6);
       getDefaultHub().pushScope();
       getDefaultHub().bindClient(
         new NodeClient({
@@ -145,6 +146,7 @@ describe('SentryNode', () => {
     });
 
     test('capture a message', done => {
+      expect.assertions(2);
       getDefaultHub().pushScope();
       getDefaultHub().bindClient(
         new NodeClient({
@@ -161,6 +163,7 @@ describe('SentryNode', () => {
     });
 
     test('capture an event', done => {
+      expect.assertions(2);
       getDefaultHub().pushScope();
       getDefaultHub().bindClient(
         new NodeClient({
@@ -176,26 +179,23 @@ describe('SentryNode', () => {
       getDefaultHub().popScope();
     });
 
-    test('capture an event in a domain', async () => {
+    test('capture an event in a domain', async () =>
       new Promise<void>(resolve => {
         const d = domain.create();
+        const client = new NodeClient({
+          afterSend: (event: SentryEvent) => {
+            expect(event.message).toBe('test');
+            expect(event.exception).toBeUndefined();
+            resolve();
+            d.exit();
+          },
+          dsn,
+        });
         d.run(() => {
-          getDefaultHub().pushScope();
-          getDefaultHub().bindClient(
-            new NodeClient({
-              afterSend: (event: SentryEvent) => {
-                expect(event.message).toBe('test');
-                expect(event.exception).toBeUndefined();
-                resolve();
-                d.exit();
-              },
-              dsn,
-            }),
-          );
-          captureEvent({ message: 'test' });
-          getDefaultHub().popScope();
+          getDefaultHub().bindClient(client);
+          expect(getDefaultHub().getClient()).toBe(client);
+          getDefaultHub().captureEvent({ message: 'test' });
         });
-      });
-    });
+      }));
   });
 });