Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-06 21:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: return 404 if extendRoutes without Component (#3608)

Browse Source 
resolve #3351
This commit is contained in:
Clark Du 2018-08-13 17:27:20 +01:00 committed by GitHub
parent 09188dd173
commit 5ddc394a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/app/utils.js
View File

@ -77,9 +77,14 @@ export function getMatchedComponentsInstances(route, matches = false) {
export function flatMapComponents(route, fn) { export function flatMapComponents(route, fn) {
return Array.prototype.concat.apply([], route.matched.map(function (m, index) { return Array.prototype.concat.apply([], route.matched.map(function (m, index) {
return Object.keys(m.components).map(function (key) { return Object.keys(m.components).reduce(function (promises, key) {
return fn(m.components[key], m.instances[key], m, key, index) if (m.components[key]) {
}) promises.push(fn(m.components[key], m.instances[key], m, key, index))
} else {
delete m.components[key]
}
return promises
}, [])
})) }))
} }

3
test/fixtures/with-config/nuxt.config.js vendored
View File

@ -20,6 +20,9 @@ export default {
{ {
path: '/redirect/about-bis', path: '/redirect/about-bis',
redirect: '/about-bis' redirect: '/about-bis'
},
{
path: '/not-existed'
} }
] ]
} }

5
test/unit/with-config.test.js
View File

@ -112,6 +112,11 @@ describe('with-config', () => {
expect(html.includes('<h1>About page</h1>')).toBe(true) expect(html.includes('<h1>About page</h1>')).toBe(true)
}) })
test('/test/not-existed should return 404', async () => {
await expect(rp(url('/test/not-existed')))
.rejects.toMatchObject({ statusCode: 404 })
})
test('/test/redirect/about-bis (redirect with extendRoutes)', async () => { test('/test/redirect/about-bis (redirect with extendRoutes)', async () => {
const window = await nuxt.renderAndGetWindow(url('/test/redirect/about-bis')) const window = await nuxt.renderAndGetWindow(url('/test/redirect/about-bis'))
const windowHref = window.location.href const windowHref = window.location.href