Fix unit tests.

test/unit/router.test.js

@@ -1,52 +1,53 @@
 /* global describe, it, expect */
 import Router from '../../dist/lib/router/router'
 
+class PageLoader {
+  constructor (options = {}) {
+    this.options = options
+    this.loaded = {}
+  }
+
+  loadPage (route) {
+    this.loaded[route] = true
+
+    if (this.options.delay) {
+      return new Promise((resolve) => setTimeout(resolve, this.options.delay))
+    }
+  }
+}
+
 describe('Router', () => {
   const request = { clone: () => null }
   describe('.prefetch()', () => {
     it('should prefetch a given page', async () => {
-      const router = new Router('/', {})
+      const pageLoader = new PageLoader()
-      const promise = Promise.resolve(request)
+      const router = new Router('/', {}, '/', { pageLoader })
-      const route = 'routex'
+      const route = '/routex'
-      router.doFetchRoute = (r) => {
-        expect(r).toBe(route)
-        return promise
-      }
       await router.prefetch(route)
 
-      expect(router.fetchingRoutes[route]).toBe(promise)
+      expect(pageLoader.loaded['/routex']).toBeTruthy()
-    })
-
-    it('should stop if it\'s prefetching already', async () => {
-      const router = new Router('/', {})
-      const route = 'routex'
-      router.fetchingRoutes[route] = Promise.resolve(request)
-      router.doFetchRoute = () => { throw new Error('Should not happen') }
-      await router.prefetch(route)
     })
 
     it('should only run two jobs at a time', async () => {
-      const router = new Router('/', {})
+      // delay loading pages for an hour
-      let count = 0
+      const pageLoader = new PageLoader({ delay: 1000 * 3600 })
-
+      const router = new Router('/', {}, '/', { pageLoader })
-      router.doFetchRoute = () => {
-        count++
-        return new Promise((resolve) => {})
-      }
 
       router.prefetch('route1')
       router.prefetch('route2')
       router.prefetch('route3')
       router.prefetch('route4')
 
+      // Wait for a bit
       await new Promise((resolve) => setTimeout(resolve, 50))
 
-      expect(count).toBe(2)
+      expect(Object.keys(pageLoader.loaded).length).toBe(2)
-      expect(Object.keys(router.fetchingRoutes)).toEqual(['route1', 'route2'])
+      expect(Object.keys(pageLoader.loaded)).toEqual(['route1', 'route2'])
     })
 
     it('should run all the jobs', async () => {
-      const router = new Router('/', {})
+      const pageLoader = new PageLoader()
+      const router = new Router('/', {}, '/', { pageLoader })
       const routes = ['route1', 'route2', 'route3', 'route4']
 
       router.doFetchRoute = () => Promise.resolve(request)
@@ -56,7 +57,7 @@ describe('Router', () => {
       await router.prefetch(routes[2])
       await router.prefetch(routes[3])
 
-      expect(Object.keys(router.fetchingRoutes)).toEqual(routes)
+      expect(Object.keys(pageLoader.loaded)).toEqual(routes)
     })
   })
 })