Merge pull request #300 from sveltejs/gh-293

[WIP] simplify rendering of error pages
This commit is contained in:
Rich Harris
2018-06-28 12:52:41 -04:00
committed by GitHub
9 changed files with 60 additions and 117 deletions

View File

@@ -1,6 +0,0 @@
<svelte:head>
<title>Internal server error</title>
</svelte:head>
<h1>Internal server error</h1>
<p>{error.message}</p>

View File

@@ -2,5 +2,5 @@
<title>{status}</title>
</svelte:head>
<h1>Not found</h1>
<h1>{status}</h1>
<p>{error.message}</p>

View File

@@ -439,7 +439,7 @@ function run({ mode, basepath = '' }) {
})
.then(() => nightmare.page.title())
.then(title => {
assert.equal(title, 'Not found')
assert.equal(title, '404')
});
});
@@ -454,7 +454,7 @@ function run({ mode, basepath = '' }) {
})
.then(() => nightmare.page.title())
.then(title => {
assert.equal(title, 'Not found');
assert.equal(title, '404');
});
});
@@ -466,7 +466,7 @@ function run({ mode, basepath = '' }) {
})
.then(() => nightmare.page.title())
.then(title => {
assert.equal(title, 'Internal server error')
assert.equal(title, '500')
});
});
@@ -481,7 +481,7 @@ function run({ mode, basepath = '' }) {
})
.then(() => nightmare.page.title())
.then(title => {
assert.equal(title, 'Internal server error');
assert.equal(title, '500');
});
});

View File

@@ -71,8 +71,7 @@ describe('create_routes', () => {
'blog/[slug].html',
'api/gists/[id].js',
'api/gists/index.js',
'4xx.html',
'5xx.html',
'_error.html',
'blog/index.html',
'blog/rss.xml.js',
'guide/index.html',
@@ -83,8 +82,7 @@ describe('create_routes', () => {
assert.deepEqual(
routes.map(r => r.handlers[0].file),
[
'4xx.html',
'5xx.html',
'_error.html',
'index.html',
'guide/index.html',
'blog/index.html',
@@ -99,8 +97,7 @@ describe('create_routes', () => {
routes = create_routes({
files: [
'4xx.html',
'5xx.html',
'_error.html',
'api/blog/[slug].js',
'api/blog/index.js',
'api/guide/contents.js',
@@ -119,8 +116,7 @@ describe('create_routes', () => {
assert.deepEqual(
routes.map(r => r.handlers[0].file),
[
'4xx.html',
'5xx.html',
'_error.html',
'index.html',
'guide/index.html',
'blog/index.html',