fix(core): 🐛 fix cache management with ignore option

Closes barbajs#470
codegorrilla · Dec 9, 2019 · d801813 · d801813
1 parent 10bfb2a
commit d801813
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/packages/core/__tests__/modules/cache.test.ts b/packages/core/__tests__/modules/cache.test.ts
@@ -36,7 +36,14 @@ it('deletes ', () => {
 
 it('checks url ', () => {
   cache.checkHref = jest.fn();
-  cache.set(key, request, action);
+  cache.has(key);
 
   expect(cache.checkHref).toHaveBeenCalled();
 });
+
+it('uses cacheIgnore ', () => {
+  cache.checkHref = jest.fn().mockImplementation(() => true);
+  const res = cache.has(key);
+
+  expect(res).toBeFalsy();
+});
diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts
@@ -289,16 +289,6 @@ export class Core {
       return;
     }
 
-    // if (e) {
-    //   // No history, force page reload
-    //   const { state } = e as PopStateEvent;
-    //   if (trigger === 'popstate' && state === null) {
-    //     this.force(href);
-
-    //     return;
-    //   }
-    // }
-
     let self = false;
 
     // Check prevent sameURL against current history

diff --git a/packages/core/src/modules/Cache.ts b/packages/core/src/modules/Cache.ts
@@ -29,13 +29,10 @@ export class Cache extends Ignore {
     request: CacheRequest,
     action: CacheAction
   ): ICacheData {
-    /* istanbul ignore else */
-    if (!this.checkHref(href)) {
-      this._state.set(href, {
-        action,
-        request,
-      });
-    }
+    this._state.set(href, {
+      action,
+      request,
+    });
 
     return {
       action,
@@ -68,6 +65,10 @@ export class Cache extends Ignore {
    * Check if value exists into cache
    */
   public has(href: string): boolean {
+    /* istanbul ignore else */
+    if (this.checkHref(href)) {
+      return false;
+    }
     return this._state.has(href);
   }