always expose route name (fix #595, close #591)

Author: yyx990803

examples/named-routes/app.js

@@ -3,9 +3,9 @@ import VueRouter from 'vue-router'
 
 Vue.use(VueRouter)
 
-const Home = { template: '<div>home</div>' }
-const Foo = { template: '<div>foo</div>' }
-const Bar = { template: '<div>bar</div>' }
+const Home = { template: '<div>This is Home</div>' }
+const Foo = { template: '<div>This is Foo</div>' }
+const Bar = { template: '<div>This is Bar</div>' }
 
 const router = new VueRouter({
   mode: 'history',
@@ -22,6 +22,7 @@ new Vue({
   template: `
     <div id="app">
       <h1>Named Routes</h1>
+      <p>Current route name: {{ $route.name }}</p>
       <ul>
         <li><router-link :to="{ name: 'home' }">home</router-link></li>
         <li><router-link :to="{ name: 'foo' }">foo</router-link></li>

src/create-matcher.js

@@ -125,7 +125,7 @@ export function createRoute (
   redirectedFrom?: Location
 ): Route {
   const route: Route = {
-    name: location.name,
+    name: location.name || (record && record.name),
     path: location.path || '/',
     hash: location.hash || '',
     query: location.query || {},

test/e2e/specs/named-routes.js

@@ -8,24 +8,29 @@ module.exports = {
       .assert.attributeContains('li:nth-child(1) a', 'href', '/named-routes/')
       .assert.attributeContains('li:nth-child(2) a', 'href', '/named-routes/foo')
       .assert.attributeContains('li:nth-child(3) a', 'href', '/named-routes/bar')
-      .assert.containsText('.view', 'home')
+      .assert.containsText('p', 'Current route name: home')
+      .assert.containsText('.view', 'Home')
 
       .click('li:nth-child(2) a')
       .assert.urlEquals('http://localhost:8080/named-routes/foo')
-      .assert.containsText('.view', 'foo')
+      .assert.containsText('p', 'Current route name: foo')
+      .assert.containsText('.view', 'Foo')
 
       .click('li:nth-child(3) a')
       .assert.urlEquals('http://localhost:8080/named-routes/bar')
-      .assert.containsText('.view', 'bar')
+      .assert.containsText('p', 'Current route name: bar')
+      .assert.containsText('.view', 'Bar')
 
       .click('li:nth-child(1) a')
       .assert.urlEquals('http://localhost:8080/named-routes/')
-      .assert.containsText('.view', 'home')
+      .assert.containsText('p', 'Current route name: home')
+      .assert.containsText('.view', 'Home')
 
     // check initial visit
     .url('http://localhost:8080/named-routes/foo')
       .waitForElementVisible('#app', 1000)
-      .assert.containsText('.view', 'foo')
+      .assert.containsText('p', 'Current route name: foo')
+      .assert.containsText('.view', 'Foo')
       .end()
   }
 }