Remove decodeURIComponent call in installRouter (#560)

* fix: don't spyOn pwaHelpers.installRouter

I found that after duplicating this test, `spy1.mockRestore` was not
restoring enough state, somehow. This caused the second test's
`const cb = ...` to fail.

* test: router does not escape parameteers

* test: do not mock `decodeURIComponent`

* test: URL double-decode

Tests fail on this commit, but will be fixed on the next.

* fix: don't decode `window.location`

---------

Co-authored-by: Fernando Pasik <fernando@pasik.com.ar>

Author: LiterallyVoid

src/lib/route.test.ts

@@ -59,7 +59,7 @@ describe('route element', () => {
           define: jest.fn(),
           get: customElementsGet,
         },
-        decodeURIComponent: jest.fn((val) => val),
+        decodeURIComponent,
         scrollTo: jest.fn(),
       },
     });
@@ -127,20 +127,39 @@ describe('route element', () => {
     it('can set active route', async () => {
       connectRouter(mockStore({}) as unknown as TestStore);
       const route = new Route();
-      const spy1 = jest.spyOn(pwaHelpers, 'installRouter');
-      const spy2 = jest.spyOn(actions, 'setActiveRoute');
+      const installRouter = jest.mocked(pwaHelpers.installRouter);
+      const spy = jest.spyOn(actions, 'setActiveRoute');
+
       const pathname = '/example';
       const search = '?test=testing';
       const hash = '#example';
 
       await route.firstUpdated();
-      const cb = spy1.mock.results[0].value as typeof pwaHelpers.installRouter.arguments;
+      const cb = installRouter.mock.results[0].value as typeof pwaHelpers.installRouter.arguments;
       cb({ hash, pathname, search });
 
-      expect(spy2).toHaveBeenCalledWith(pathname + search + hash);
+      expect(spy).toHaveBeenCalledWith(pathname + search + hash);
 
-      spy1.mockRestore();
-      spy2.mockRestore();
+      spy.mockRestore();
+    });
+
+    it('does not decode URLs again', async () => {
+      connectRouter(mockStore({}) as unknown as TestStore);
+      const route = new Route();
+      const installRouter = jest.mocked(pwaHelpers.installRouter);
+      const spy = jest.spyOn(actions, 'setActiveRoute');
+      const pathname = '/component%2Fone/component_two';
+      const search = '?hash=%23';
+      const hash = '#example';
+
+      await route.firstUpdated();
+
+      const cb = installRouter.mock.results[0].value as typeof pwaHelpers.installRouter.arguments;
+      cb({ hash, pathname, search });
+
+      expect(spy).toHaveBeenCalledWith(pathname + search + hash);
+
+      spy.mockRestore();
     });
   });
 

src/lib/route.ts

@@ -55,7 +55,7 @@ export default (store: LazyStore & Store): void => {
       await this.updateComplete;
       if (!Route.routerInstalled) {
         installRouter(({ pathname, search, hash }: Location): void => {
-          const path = window.decodeURIComponent(pathname + search + hash);
+          const path = pathname + search + hash;
           store.dispatch(setActiveRoute(path));
         });
         Route.routerInstalled = true;

src/lib/service.test.ts

@@ -139,4 +139,14 @@ describe('router service', () => {
     expect(SUT.active).toBe(true);
     expect(SUT.params).toStrictEqual({ id: '1' });
   });
+
+  it('does not escape parameters', () => {
+    const route = '/product/:id';
+    const activeRoute = '/product/before%2Fafter';
+
+    const SUT = refreshRoute(route, activeRoute);
+
+    expect(SUT.active).toBe(true);
+    expect(SUT.params).toStrictEqual({ id: 'before%2Fafter' });
+  });
 });