fix(core): 🐛 fix sameUrl with query params

Closes #389
barbajs · Apr 29, 2019 · fa79a6a · fa79a6a
1 parent 640a837
commit fa79a6a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/packages/core/__tests__/utils/url.test.ts b/packages/core/__tests__/utils/url.test.ts
@@ -73,7 +73,9 @@ it('parse complex query', () => {
 });
 
 it('clean url', () => {
-  const result = url.clean('http://localhost/foo', window.location.origin);
+  // const result = url.clean('http://localhost/foo', window.location.origin);
+  // expect(result).toBe('/foo');
+  const result = url.clean('http://localhost/foo?bar=baz#qux');
 
-  expect(result).toBe('/foo');
+  expect(result).toBe('http://localhost/foo?bar=baz');
 });
diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts
@@ -276,7 +276,7 @@ export class Core {
     // Check prevent sameURL against current history
     if (trigger === 'popstate') {
       self =
-        this.history &&
+        this.history.current &&
         this.url.getPath(this.history.current.url) === this.url.getPath(href);
     } else {
       self = this.prevent.run('sameUrl', null, null, href);

diff --git a/packages/core/src/modules/Prevent.ts b/packages/core/src/modules/Prevent.ts
@@ -88,7 +88,9 @@ const preventAll: PreventCheck = ({ el }) =>
  * > Not in the test suite.
  */
 const sameUrl: PreventCheck = ({ href }) =>
-  url.getPath(href) === url.getPath(window.location.href);
+  // DEV
+  // url.getPath(href) === url.getPath(window.location.href);
+  url.clean(href) === url.clean(window.location.href);
 
 export class Prevent extends Ignore {
   public suite: string[] = [];

diff --git a/packages/core/src/utils/url.ts b/packages/core/src/utils/url.ts
@@ -60,7 +60,8 @@ export const getPath = (url: string): string => parse(url).path;
  * Parse URL for path, query and hash.
  */
 export const parse = (url: string): IUrlBase => {
-  let path = clean(url);
+  // let path = clean(url);
+  let path = url.replace(getOrigin(), '');
   let hash;
   let query = {};
 
@@ -97,8 +98,12 @@ export const parseQuery = (str: string) =>
     return acc;
   }, {});
 
+/**
+ * Clean URL, remove "hash".
+ */
+export const clean = (url: string) => url.replace(/#.*/, '');
 /**
  * Clean URL, remove "origin".
  */
-export const clean = (url: string, origin = getOrigin()) =>
-  url.replace(origin, '');
+// export const clean = (url: string, origin = getOrigin()) =>
+//   url.replace(origin, '');