Skip to content

Allow alias option to be an empty string (Fix #805). #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion examples/route-alias/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const Home = { template: '<div><h1>Home</h1><router-view></router-view></div>' }
const Foo = { template: '<div>foo</div>' }
const Bar = { template: '<div>bar</div>' }
const Baz = { template: '<div>baz</div>' }
const Default = { template: '<div>default</div>' }

const router = new VueRouter({
mode: 'history',
Expand All @@ -19,7 +20,9 @@ const router = new VueRouter({
// relative alias (alias to /home/bar-alias)
{ path: 'bar', component: Bar, alias: 'bar-alias' },
// multiple aliases
{ path: 'baz', component: Baz, alias: ['/baz', 'baz-alias'] }
{ path: 'baz', component: Baz, alias: ['/baz', 'baz-alias'] },
// default child route with empty string as alias.
{ path: 'default', component: Default, alias: '' }
]
}
]
Expand All @@ -46,6 +49,10 @@ new Vue({
<li><router-link to="/home/baz-alias">
/home/baz-alias (renders /home/baz)
</router-link></li>

<li><router-link to="/home">
/home (renders /home/default)
</router-link></li>
</ul>
<router-view class="view"></router-view>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/create-route-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function addRouteRecord (
})
}

if (route.alias) {
if (route.alias !== undefined) {
if (Array.isArray(route.alias)) {
route.alias.forEach(alias => {
addRouteRecord(pathMap, nameMap, { path: alias }, parent, record.path)
Expand Down
13 changes: 12 additions & 1 deletion test/e2e/specs/route-alias.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ module.exports = {
browser
.url('http://localhost:8080/route-alias/')
.waitForElementVisible('#app', 1000)
.assert.count('li a', 4)
.assert.count('li a', 5)
// assert correct href with base
.assert.attributeContains('li:nth-child(1) a', 'href', '/route-alias/foo')
.assert.attributeContains('li:nth-child(2) a', 'href', '/route-alias/home/bar-alias')
.assert.attributeContains('li:nth-child(3) a', 'href', '/route-alias/baz')
.assert.attributeContains('li:nth-child(4) a', 'href', '/route-alias/home/baz-alias')
.assert.attributeEquals('li:nth-child(5) a', 'href', 'http://localhost:8080/route-alias/home')

.click('li:nth-child(1) a')
.assert.urlEquals('http://localhost:8080/route-alias/foo')
Expand All @@ -29,6 +30,10 @@ module.exports = {
.assert.urlEquals('http://localhost:8080/route-alias/home/baz-alias')
.assert.containsText('.view', 'Home')
.assert.containsText('.view', 'baz')
.click('li:nth-child(5) a')
.assert.urlEquals('http://localhost:8080/route-alias/home')
.assert.containsText('.view', 'Home')
.assert.containsText('.view', 'default')

// check initial visit
.url('http://localhost:8080/route-alias/foo')
Expand All @@ -54,6 +59,12 @@ module.exports = {
.assert.urlEquals('http://localhost:8080/route-alias/home/baz-alias')
.assert.containsText('.view', 'Home')
.assert.containsText('.view', 'baz')

.url('http://localhost:8080/route-alias/home')
.waitForElementVisible('#app', 1000)
.assert.urlEquals('http://localhost:8080/route-alias/home')
.assert.containsText('.view', 'Home')
.assert.containsText('.view', 'default')
.end()
}
}