fix(jasmine): Use Jasmine assertions.

cartant · Nov 11, 2018 · 36771ca · 36771ca
1 parent dca931e
commit 36771ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/source/jasmine/index.ts b/source/jasmine/index.ts
@@ -17,6 +17,7 @@ export { MarblesFunction } from "../marbles";
 export * from "./observe";
 
 declare const describe: Function;
+declare const expect: Function;
 declare const fit: Function;
 declare const it: Function;
 declare const xit: Function;
@@ -30,7 +31,11 @@ export function configure(configuration: Configuration): {
     cases: CasesFunction,
     marbles: MarblesFunction
 } {
-    const { marbles } = _configure(configuration);
+    const { marbles } = _configure({
+        assert: (a, m) => expect(a).toBeTruthy().withContext(m),
+        assertDeepEqual: (a, e) => expect(a).toEqual(e),
+        ...configuration
+    });
 
     function cases<T extends UnnamedCase>(name: string, func: (context: Context, _case: T) => void, cases: { [key: string]: T }): void;
     function cases<T extends NamedCase>(name: string, func: (context: Context, _case: T) => void, cases: T[]): void;

diff --git a/source/jest/index.ts b/source/jest/index.ts
@@ -29,9 +29,9 @@ export function configure(configuration: Configuration): {
     marbles: MarblesFunction
 } {
     const { marbles } = _configure({
-        ...configuration,
         assertDeepEqual: (a, e) => expect(a).toEqual(e),
-        frameworkMatcher: true
+        frameworkMatcher: true,
+        ...configuration
     });
 
     function cases<T extends UnnamedCase>(name: string, func: (context: Context, _case: T) => void, cases: { [key: string]: T }): void;