test: add tests for utils

Author: yyx990803

src/util.js

@@ -134,32 +134,19 @@ export function resolveAsyncComponent (handler, cb) {
  * @param {Object} query
  */
 
-export function mapParams (path, params, query) {
-  for (let key in params) {
-    path = replaceParam(path, params, key)
-  }
+export function mapParams (path, params = {}, query) {
+  path = path.replace(/:([^\/]+)/g, (_, key) => {
+    let val = params[key]
+    if (!val) {
+      warn(
+        'param "' + key + '" not found when generating ' +
+        'path for "' + path + '" with params ' + JSON.stringify(params)
+      )
+    }
+    return val || ''
+  })
   if (query) {
     path += genQuery(query)
   }
   return path
 }
-
-/**
- * Replace a param segment with real value in a matched
- * path.
- *
- * @param {String} path
- * @param {Object} params
- * @param {String} key
- * @return {String}
- */
-
-function replaceParam (path, params, key) {
-  let regex = new RegExp(':' + key + '(\\/|$)')
-  let value = params[key]
-  return path.replace(regex, m =>
-    m.charAt(m.length - 1) === '/'
-      ? value + '/'
-      : value
-  )
-}

test/unit/specs/index.js

@@ -11,6 +11,7 @@ var Vue = require('vue')
 var Router = require('../../../src')
 Vue.use(Router)
 
+require('./util')
 require('./core')
 
 describe('Pipeline', function () {

test/unit/specs/pipeline/activate.js

@@ -1,4 +1,4 @@
-var testUtils = require('../util')
+var testUtils = require('../../lib/pipeline-test-util')
 var test = testUtils.test
 var assertCalls = testUtils.assertCalls
 var routerUtil = require('../../../../src/util')

test/unit/specs/pipeline/can-activate.js

@@ -1,4 +1,4 @@
-var testUtils = require('../util')
+var testUtils = require('../../lib/pipeline-test-util')
 var test = testUtils.test
 var assertCalls = testUtils.assertCalls
 

test/unit/specs/pipeline/can-deactivate.js

@@ -1,4 +1,4 @@
-var testUtils = require('../util')
+var testUtils = require('../../lib/pipeline-test-util')
 var test = testUtils.test
 var assertCalls = testUtils.assertCalls
 

test/unit/specs/pipeline/can-reuse.js

@@ -1,4 +1,4 @@
-var testUtils = require('../util')
+var testUtils = require('../../lib/pipeline-test-util')
 var test = testUtils.test
 var assertCalls = testUtils.assertCalls
 

test/unit/specs/pipeline/data.js

@@ -1,4 +1,4 @@
-var testUtils = require('../util')
+var testUtils = require('../../lib/pipeline-test-util')
 var test = testUtils.test
 var assertCalls = testUtils.assertCalls
 var routerUtil = require('../../../../src/util')

test/unit/specs/pipeline/deactivate.js

@@ -1,4 +1,4 @@
-var testUtils = require('../util')
+var testUtils = require('../../lib/pipeline-test-util')
 var test = testUtils.test
 var assertCalls = testUtils.assertCalls
 

test/unit/specs/pipeline/full.js

@@ -1,4 +1,4 @@
-var testUtils = require('../util')
+var testUtils = require('../../lib/pipeline-test-util')
 var test = testUtils.test
 var assertCalls = testUtils.assertCalls
 var util = require('../../../../src/util')

test/unit/specs/util.js

@@ -1,94 +1,51 @@
-var Vue = require('vue')
-var Router = require('../../../src')
-var Emitter = require('events').EventEmitter
+var util = require('../../../src/util')
 
-/**
- * Setup a router app for testing with two nested routes:
- *
- * - /a/b
- * - /c/d
- *
- * @param {Object} configs - an object that contains the
- *                           route configs for each component.
- * @param {Function} cb(router, calls, emitter)
- */
+describe('Util', function () {
 
-exports.test = function (configs, cb) {
-  var emitter = new Emitter()
-  var router = new Router({ abstract: true })
-  var el = document.createElement('div')
-  var App = Vue.extend({ template: '<div><router-view></router-view></div>' })
-  var calls = []
-  // wrap hooks
-  Object.keys(configs).forEach(function (route) {
-    var config = configs[route]
-    Object.keys(config).forEach(function (hook) {
-      var fn = config[hook]
-      config[hook] = function (transition) {
-        var event = route + '.' + hook
-        calls.push(event)
-        var res = typeof fn === 'function'
-          ? fn(transition)
-          : fn
-        emitter.emit(event)
-        return res
-      }
-    })
+  it('resolvePath', function () {
+    expect(util.resolvePath('/a', 'b')).toBe('/b')
+    expect(util.resolvePath('/a/', 'b')).toBe('/a/b')
+    expect(util.resolvePath('/a', '/b')).toBe('/b')
+    expect(util.resolvePath('/a/', '/b')).toBe('/a/b')
+    // append mode
+    expect(util.resolvePath('/a', 'b', true)).toBe('/a/b')
+    expect(util.resolvePath('/a/', 'b', true)).toBe('/a/b')
+    expect(util.resolvePath('/a', '/b', true)).toBe('/a/b')
+    expect(util.resolvePath('/a/', '/b', true)).toBe('/a/b')
+    // relative query
+    expect(util.resolvePath('/a', '?b=1')).toBe('/a?b=1')
+    expect(util.resolvePath('/a/', '?b=1')).toBe('/a/?b=1')
   })
-  router.map({
-    '/a': {
-      component: {
-        template: 'A <router-view></router-view>',
-        route: configs.a
-      },
-      subRoutes: {
-        '/b': {
-          component: {
-            template: 'B',
-            route: configs.b
-          }
-        },
-        '/e': {
-          component: {
-            template: 'E'
-          }
-        }
-      }
-    },
-    '/c': {
-      component: {
-        template: 'C <router-view></router-view>',
-        route: configs.c
-      },
-      subRoutes: {
-        '/d': {
-          component: {
-            template: 'D',
-            route: configs.d
-          }
-        }
-      }
-    },
-    '/data/:msg': {
-      component: {
-        route: configs.data,
-        template:
-          '<span v-if="$loadingRouteData">loading...</span>' +
-          '<span v-if="!$loadingRouteData">{{msg}}</span>',
-        data: function () {
-          return {
-            msg: 'default'
-          }
-        }
+
+  it('mapParams', function () {
+    expect(util.mapParams('/a/:id', { id: 'b' })).toBe('/a/b')
+    expect(util.mapParams('/a/:id/', { id: 'b' })).toBe('/a/b/')
+    expect(util.mapParams('/a/:id/c/:d', { id: 'b', d: 'd' })).toBe('/a/b/c/d')
+    expect(util.mapParams('/a/:id/c/:d', { id: 'b', d: 'd' }, { e: 123 })).toBe('/a/b/c/d?e=123')
+  })
+
+  it('resolveAsyncComponent', function (done) {
+    var handler = {
+      component: function (resolve) {
+        setTimeout(function () {
+          resolve({
+            template: 'hi'
+          })
+        }, 0)
       }
     }
+    util.resolveAsyncComponent(handler, function (Component) {
+      expect(Component.options.template).toBe('hi')
+      done()
+    })
   })
-  router.start(App, el)
-  cb(router, calls, emitter)
-}
 
-exports.assertCalls = function (calls, expects) {
-  expects.forEach(function (e, i) {
-    expect(calls[i]).toBe(e)
+  it('getRouteConfig', function () {
+    expect(util.getRouteConfig({}, 'data')).toBeUndefined()
+    expect(util.getRouteConfig({ options: { route: {}}}, 'data')).toBeUndefined()
+    expect(util.getRouteConfig({ options: { route: { data: 1 }}}, 'data')).toBe(1)
+    expect(util.getRouteConfig({ $options: { route: {}}}, 'data')).toBeUndefined()
+    expect(util.getRouteConfig({ $options: { route: { data: 1 }}}, 'data')).toBe(1)
   })
-}
+
+})