test

mwikstrom · Feb 24, 2018 · cf4f34e · cf4f34e
1 parent 38eceff
commit cf4f34e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/src/createAppHistory.spec.ts b/src/createAppHistory.spec.ts
@@ -21,6 +21,22 @@ describe("createAppHistory", async () => {
         expect(history.cacheLimit).toBe(123);
     });
 
+    it("cannot be invoked with provider that does not declare a matching factory func", () => {
+        let error: Error | null = null;
+
+        try {
+            createAppHistory({
+                mode: "memory",
+                provider: {},
+            });
+        } catch (caught) {
+            error = caught;
+        }
+
+        expect(error).not.toBeNull();
+        expect(error.message).toBe("app-history: Provider does not support memory history");
+    });
+
     describe("returns a history extension object that", async () => {
         it("keeps track of app history depth", async () => {
             const history = await createAndInitAppHistory({mode: "memory"});

diff --git a/src/createSource.ts b/src/createSource.ts
@@ -2,10 +2,21 @@ import { createBrowserHistory, createMemoryHistory } from "history";
 
 import { IHistory, IHistoryProvider, SourceMode, UserConfirmation } from "./api";
 
+const defaultUserConfirmation: UserConfirmation = (message, callback) => {
+    callback(window.confirm(message));
+};
+
+const noUserConfirmation: UserConfirmation = (_, callback) => {
+    callback(true);
+};
+
+const makeDefaultUserConfirmation = (mode: SourceMode) =>
+    mode === "browser" ? defaultUserConfirmation : noUserConfirmation;
+
 export function createSource(
     onChangeWasBlocked: () => void,
     mode: SourceMode,
-    getUserConfirmation?: UserConfirmation,
+    getUserConfirmation: UserConfirmation = makeDefaultUserConfirmation(mode),
     provider?: IHistoryProvider,
 ): IHistory {
     const getTrackedUserConfirmation: UserConfirmation = (message, callback) => {
@@ -19,13 +30,7 @@ export function createSource(
             }
         };
 
-        if (getUserConfirmation) {
-            getUserConfirmation(message, trackingCallback);
-        } else if (mode === "browser") {
-            trackingCallback(window.confirm(message));
-        } else {
-            callback(true);
-        }
+        getUserConfirmation(message, trackingCallback);
     };
 
     if (!provider) {
@@ -39,7 +44,7 @@ export function createSource(
         provider.createMemoryHistory : provider.createBrowserHistory;
 
     if (!factoryFunc) {
-        throw new Error("app-history: Missing provider for " + mode + " history");
+        throw new Error("app-history: Provider does not support " + mode + " history");
     }
 
     if (provider) {