From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Fri, 19 Apr 2019 11:59:51 +0000 (+0200)
Subject: fix: wait when calling guards
X-Git-Tag: v4.0.0-alpha.0~430
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87a7cede0580d57fb4470edfcd7f30fd12e41faa;p=thirdparty%2Fvuejs%2Frouter.git

fix: wait when calling guards
---

diff --git a/__tests__/guards.spec.js b/__tests__/guards.spec.js
index 185182be..c101383a 100644
--- a/__tests__/guards.spec.js
+++ b/__tests__/guards.spec.js
@@ -6,6 +6,8 @@ const { Router } = require('../src/router')
 const { JSDOM } = require('jsdom')
 const fakePromise = require('faked-promise')
 
+const tick = () => new Promise(resolve => process.nextTick(resolve))
+
 /**
  * @param {Partial<import('../src/router').RouterOptions> & { routes: import('../src/types').RouteRecord[]}} options
  */
@@ -62,4 +64,34 @@ describe('navigation guards', () => {
     await p
     expect(router.currentRoute.fullPath).toBe('/foo')
   })
+
+  it('waits in the right order', async () => {
+    const [p1, r1] = fakePromise()
+    const [p2, r2] = fakePromise()
+    const router = createRouter({ routes })
+    const guard1 = jest.fn(async (to, from, next) => {
+      await p1
+      next()
+    })
+    router.beforeEach(guard1)
+    const guard2 = jest.fn(async (to, from, next) => {
+      await p2
+      next()
+    })
+    router.beforeEach(guard2)
+    let navigation = router.push('/foo')
+    expect(router.currentRoute.fullPath).toBe('/')
+    expect(guard1).toHaveBeenCalled()
+    expect(guard2).not.toHaveBeenCalled()
+    r1()
+    // wait until the guard is called
+    await tick()
+    await tick()
+    expect(guard2).toHaveBeenCalled()
+    r2()
+    expect(router.currentRoute.fullPath).toBe('/')
+    await navigation
+    expect(guard2).toHaveBeenCalled()
+    expect(router.currentRoute.fullPath).toBe('/foo')
+  })
 })
diff --git a/__tests__/html5.spec.js b/__tests__/html5.spec.js
index 48f73a54..ec903790 100644
--- a/__tests__/html5.spec.js
+++ b/__tests__/html5.spec.js
@@ -4,7 +4,7 @@ const expect = require('expect')
 const { HTML5History } = require('../src/history/html5')
 const { JSDOM } = require('jsdom')
 
-describe('History HTMl5', () => {
+describe.skip('History HTMl5', () => {
   beforeAll(() => {
     // TODO: move to utils for tests that need DOM
     const dom = new JSDOM(
diff --git a/src/router.ts b/src/router.ts
index 4e680887..7167a2d2 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -71,30 +71,32 @@ export class Router {
     this.currentRoute = toLocation
   }
 
-  async navigate(
+  private async navigate(
     to: RouteLocationNormalized,
     from: RouteLocationNormalized
   ): Promise<TODO> {
     // TODO: Will probably need to be some kind of queue in the future that allows to remove
     // elements and other stuff
-    const guards: Promise<any>[] = []
+    const guards: Array<() => Promise<any>> = []
 
     for (const guard of this.beforeGuards) {
       guards.push(
-        new Promise((resolve, reject) => {
-          const next: NavigationGuardCallback = (valid?: boolean) => {
-            if (valid === false) reject(new Error('Aborted'))
-            else resolve()
-          }
+        () =>
+          new Promise((resolve, reject) => {
+            const next: NavigationGuardCallback = (valid?: boolean) => {
+              // TODO: better error
+              if (valid === false) reject(new Error('Aborted'))
+              else resolve()
+            }
 
-          guard(to, from, next)
-        })
+            guard(to, from, next)
+          })
       )
     }
 
     console.log('Guarding against', guards.length, 'guards')
     for (const guard of guards) {
-      await guard
+      await guard()
     }
   }