fix: Override default configurations.

First with framework-specific defaults and then with caller-specified config.
cartant · Mar 26, 2020 · e4f5930 · e4f5930
1 parent 04562c5
commit e4f5930
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/source/ava/index.ts b/source/ava/index.ts
@@ -43,8 +43,9 @@ export function configure(
     assertDeepEqual: t.deepEqual.bind(t)
   });
   const configured = _configure((t: ExecutionContext) => ({
-    ...configuration,
-    ...factory(t)
+    ...defaults(),
+    ...factory(t),
+    ...configuration
   }));
   const marbles: MarblesFunction = configured.marbles;
 
@@ -71,7 +72,7 @@ export function configure(
   return { cases, marbles };
 }
 
-const { cases, marbles } = configure(defaults());
+const { cases, marbles } = configure({});
 export { cases, marbles };
 
 export function fakeSchedulers(

diff --git a/source/jasmine/index.ts b/source/jasmine/index.ts
@@ -43,7 +43,7 @@ export function configure(
 } {
   const { assert: defaultAssert } = defaults();
   const { marbles } = _configure({
-    ...configuration,
+    ...defaults(),
     assert: (a, m) => {
       // It seems that withContext was introduced in Jasmine 3.3.0 and,
       // prior to that, user-defined messages for failures weren't
@@ -57,7 +57,8 @@ export function configure(
         defaultAssert!(a, m);
       }
     },
-    assertDeepEqual: (a, e) => expect(a).toEqual(e)
+    assertDeepEqual: (a, e) => expect(a).toEqual(e),
+    ...configuration
   });
 
   function cases<T extends UnnamedCase>(
@@ -94,7 +95,7 @@ export function configure(
   return { cases, marbles };
 }
 
-const { cases, marbles } = configure(defaults());
+const { cases, marbles } = configure({});
 export { cases, marbles };
 
 export function fakeSchedulers(fakeTest: () => any): () => any {

diff --git a/source/jest/index.ts b/source/jest/index.ts
@@ -39,9 +39,10 @@ export function configure(
   marbles: MarblesFunction;
 } {
   const { marbles } = _configure({
-    ...configuration,
+    ...defaults(),
     assertDeepEqual: (a, e) => expect(a).toEqual(e),
-    frameworkMatcher: true
+    frameworkMatcher: true,
+    ...configuration
   });
 
   function cases<T extends UnnamedCase>(
@@ -66,7 +67,10 @@ export function configure(
             )
           );
         } else {
-          t(c.name, marbles((m, ...rest: any[]) => func(m, c, ...rest)));
+          t(
+            c.name,
+            marbles((m, ...rest: any[]) => func(m, c, ...rest))
+          );
         }
       }, cases);
     });
@@ -75,5 +79,5 @@ export function configure(
   return { cases, marbles };
 }
 
-const { cases, marbles } = configure(defaults());
+const { cases, marbles } = configure({});
 export { cases, marbles };
diff --git a/source/tape/index.ts b/source/tape/index.ts
@@ -41,8 +41,9 @@ export function configure(
     assertDeepEqual: t.deepEqual.bind(t)
   });
   const configured = _configure((t: tape.Test) => ({
-    ...configuration,
-    ...factory(t)
+    ...defaults(),
+    ...factory(t),
+    ...configuration
   }));
   const marbles: MarblesFunction = configured.marbles;
 
@@ -69,7 +70,7 @@ export function configure(
   return { cases, marbles };
 }
 
-const { cases, marbles } = configure(defaults());
+const { cases, marbles } = configure({});
 export { cases, marbles };
 
 export function fakeSchedulers(