fix(marbles): Return what func returns.

cartant · Mar 5, 2018 · dde5031 · dde5031
1 parent bceb7db
commit dde5031
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/fixtures/jest/passing-spec.ts b/fixtures/jest/passing-spec.ts
@@ -51,3 +51,8 @@ cases("should support cases", (m, c) => {
         e: "-|"
     }
 });
+
+test("it should support promises", marbles((m) => {
+
+    return Promise.resolve().then(() => expect(typeof m).toEqual("object"));
+}));
diff --git a/fixtures/mocha/passing-spec.ts b/fixtures/mocha/passing-spec.ts
@@ -4,6 +4,7 @@
  */
 /*tslint:disable:object-literal-sort-keys*/
 
+import { expect } from "chai";
 import { cases, marbles } from "../../dist/mocha";
 
 import "rxjs/add/operator/delay";
@@ -196,4 +197,9 @@ describe("rxjs-marbles", () => {
             e: "-|"
         }
     });
+
+    it("should support promises", marbles((m) => {
+
+        return Promise.resolve().then(() => expect(m).to.be.an("object"));
+    }));
 });
diff --git a/source/ava/index.ts b/source/ava/index.ts
@@ -22,13 +22,13 @@ export function cases(name: string, func: any, cases: any): void {
     }, cases);
 }
 
-export function marbles(func: (m: Context, t: TestContext) => void): any {
+export function marbles(func: (m: Context, t: TestContext) => any): any {
 
     return _marbles<TestContext>((m, t) => {
         m.configure({
             assert: t.truthy.bind(t),
             assertDeepEqual: t.deepEqual.bind(t)
         });
-        func(m, t);
+        return func(m, t);
     });
 }
diff --git a/source/jest/index.ts b/source/jest/index.ts
@@ -31,13 +31,13 @@ export function cases(name: string, func: any, cases: any): void {
     });
 }
 
-export function marbles(func: (m: Context, ...rest: any[]) => void): any {
+export function marbles(func: (m: Context, ...rest: any[]) => any): any {
 
     return _marbles((m: Context, ...rest: any[]) => {
         m.configure({
             assertDeepEqual: (a, e) => expect(a).toEqual(e),
             frameworkMatcher: true
         });
-        func(m, ...rest);
+        return func(m, ...rest);
     });
 }
diff --git a/source/marbles.ts b/source/marbles.ts
@@ -24,8 +24,9 @@ export function marbles(func: (context: Context, ...rest: any[]) => any): (...re
                 get("frameworkMatcher")
             ));
             const context = new Context(scheduler);
-            func(context, first, ...rest);
+            const result = func(context, first, ...rest);
             context.teardown();
+            return result;
         };
     }
     return (...rest: any[]) => {
@@ -36,7 +37,8 @@ export function marbles(func: (context: Context, ...rest: any[]) => any): (...re
             get("frameworkMatcher")
         ));
         const context = new Context(scheduler);
-        func(context, ...rest);
+        const result = func(context, ...rest);
         context.teardown();
+        return result;
     };
 }
diff --git a/source/tape/index.ts b/source/tape/index.ts
@@ -22,13 +22,13 @@ export function cases(name: string, func: any, cases: any): void {
     }, cases);
 }
 
-export function marbles(func: (m: Context, t: tape.Test) => void): any {
+export function marbles(func: (m: Context, t: tape.Test) => any): any {
 
     return _marbles<tape.Test>((m, t) => {
         m.configure({
             assert: t.ok.bind(t),
             assertDeepEqual: t.deepEqual.bind(t)
         });
-        func(m, t);
+        return func(m, t);
     });
 }