feat(context): Support string expectations.

cartant · Jul 24, 2017 · 99fc0df · 99fc0df
1 parent eaa6199
commit 99fc0df
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 10 deletions.
diff --git a/fixtures/mocha/passing-spec.ts b/fixtures/mocha/passing-spec.ts
@@ -71,4 +71,23 @@ describe("rxjs-marbles", () => {
         m.expect(destination).toBeObservable(expected);
         m.expect(source).toHaveSubscriptions(subs);
     }));
+
+    it("should support string-based assertions", marbles((m) => {
+
+        const values = {
+            a: 1,
+            b: 2,
+            c: 3,
+            d: 4
+        };
+
+        const source =  m.hot("--^-a-b-c-|", values);
+        const subs =            "^-------!";
+        const expected =        "--b-c-d-|";
+
+        const destination = source.map((value) => value + 1);
+
+        m.expect(destination).toBeObservable(expected, values);
+        m.expect(source).toHaveSubscriptions(subs);
+    }));
 });
diff --git a/fixtures/tape/passing-spec.ts b/fixtures/tape/passing-spec.ts
@@ -50,3 +50,24 @@ tape("it should support marble tests with terse assertions", marbles((m, t) => {
     m.equal(destination, expected);
     m.has(source, subs);
 }));
+
+tape("it should support string-based assertions", marbles((m, t) => {
+
+    t.plan(2);
+
+    const values = {
+        a: 1,
+        b: 2,
+        c: 3,
+        d: 4
+    };
+
+    const source =  m.hot("--^-a-b-c-|", values);
+    const subs =            "^-------!";
+    const expected =        "--b-c-d-|";
+
+    const destination = source.map((value) => value + 1);
+
+    m.equal(destination, expected, values);
+    m.has(source, subs);
+}));
diff --git a/source/context.ts b/source/context.ts
@@ -27,13 +27,23 @@ export class Context {
         return observable;
     }
 
-    equal<T = any>(actual: Observable<T>, expected: Observable<T>): void {
-
-        assertArgs(expected);
+    equal<T = any>(actual: Observable<T>, expected: Observable<T>): void;
+    equal<T = any>(actual: Observable<T>, expected: string, values?: { [key: string]: T }, error?: any): void;
+    equal<T = any>(actual: Observable<T>, expected: Observable<T> | string, values?: { [key: string]: T }, error?: any): void {
 
         const { testScheduler } = this;
-        const { error, marbles, values } = expected[argsSymbol];
-        testScheduler.expectObservable(actual).toBe(marbles, values, error);
+
+        if (typeof expected === "string") {
+
+            testScheduler.expectObservable(actual).toBe(expected, values, error);
+
+        } else {
+
+            assertArgs(expected);
+
+            const { error, marbles, values } = expected[argsSymbol];
+            testScheduler.expectObservable(actual).toBe(marbles, values, error);
+        }
     }
 
     expect<T = any>(actual: Observable<T>): Expect<T> {

diff --git a/source/expect.ts b/source/expect.ts
@@ -14,13 +14,23 @@ export class Expect<T> {
 
     constructor(private actual: ColdObservable<T> | HotObservable<T>, private testScheduler: TestScheduler) {}
 
-    toBeObservable(expected: ColdObservable<T> | HotObservable<T>): void {
-
-        assertArgs(expected);
+    toBeObservable(expected: ColdObservable<T> | HotObservable<T>): void;
+    toBeObservable(expected: string, values?: { [key: string]: T }, error?: any): void;
+    toBeObservable(expected: ColdObservable<T> | HotObservable<T> | string, values?: { [key: string]: T }, error?: any): void {
 
         const { actual, testScheduler } = this;
-        const { error, marbles, values } = expected[argsSymbol];
-        testScheduler.expectObservable(actual).toBe(marbles, values, error);
+
+        if (typeof expected === "string") {
+
+            testScheduler.expectObservable(actual).toBe(expected, values, error);
+
+        } else {
+
+            assertArgs(expected);
+
+            const { error, marbles, values } = expected[argsSymbol];
+            testScheduler.expectObservable(actual).toBe(marbles, values, error);
+        }
     }
 
     toHaveSubscriptions(expected: string | string[]): void {