fix empty path matching (fix #587)

Author: yyx990803

src/history/base.js

@@ -11,17 +11,18 @@ export class History {
   base: string;
   current: Route;
   pending: ?Route;
-  cb: Function;
+  cb: (r: Route) => void;
 
   // implemented by sub-classes
-  go: Function;
-  push: Function;
-  replace: Function;
-  onInit: Function;
+  go: (n: number) => void;
+  push: (loc: RawLocation) => void;
+  replace: (loc: RawLocation) => void;
+  onInit: (cb: Function) => void;
+  getLocation: () => string;
 
   constructor (router: VueRouter, base: ?string) {
     this.router = router
-    this.base = normalizeBae(base)
+    this.base = normalizeBase(base)
     // start with a route object that stands for "nowhere"
     this.current = createRoute(null, {
       path: '__vue_router_init__'
@@ -87,13 +88,9 @@ export class History {
       hook && hook(route)
     })
   }
-
-  getLocation (): string {
-    return '/'
-  }
 }
 
-function normalizeBae (base: ?string): string {
+function normalizeBase (base: ?string): string {
   if (!base) {
     if (inBrowser) {
       // respect <base> tag

src/history/hash.js

@@ -12,13 +12,13 @@ export class HashHistory extends History {
     if (fallback && this.checkFallback()) {
       return
     }
+    ensureSlash()
     window.addEventListener('hashchange', () => {
       this.onHashChange()
     })
   }
 
   onInit () {
-    ensureSlash()
     // possible redirect on start
     if (getHash() !== this.current.fullPath) {
       replaceHash(this.current.fullPath)

src/history/html5.js

@@ -112,7 +112,7 @@ export function getLocation (base: string): string {
   if (base && path.indexOf(base) === 0) {
     path = path.slice(base.length)
   }
-  return path + window.location.search + window.location.hash
+  return (path || '/') + window.location.search + window.location.hash
 }
 
 function pushState (url: string, replace?: boolean) {

test/unit/specs/location.spec.js

@@ -13,6 +13,22 @@ describe('Location utils', () => {
       }))
     })
 
+    it('empty string', function () {
+      const loc = normalizeLocation('', { path: '/abc' })
+      expect(loc._normalized).toBe(true)
+      expect(loc.path).toBe('/abc')
+      expect(loc.hash).toBe('')
+      expect(JSON.stringify(loc.query)).toBe(JSON.stringify({}))
+    })
+
+    it('undefined', function () {
+      const loc = normalizeLocation({}, { path: '/abc' })
+      expect(loc._normalized).toBe(true)
+      expect(loc.path).toBe('/abc')
+      expect(loc.hash).toBe('')
+      expect(JSON.stringify(loc.query)).toBe(JSON.stringify({}))
+    })
+
     it('relative', () => {
       const loc = normalizeLocation('abc?foo=bar&baz=qux#hello', {
         path: '/root/next'