totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-20 06:15:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Nolan Lawson
2018-09-07 17:25:17 -07:00
parent 2d1f535314
commit 87ff9c2aeb
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/middleware.ts
View File

@@ -312,6 +312,7 @@ function get_page_handler(
} = get_build_info(); } = get_build_info();
res.setHeader('Content-Type', 'text/html'); res.setHeader('Content-Type', 'text/html');
res.setHeader('Cache-Control', dev() ? 'no-cache' : 'max-age=600');
// preload main.js and current route // preload main.js and current route
// TODO detect other stuff we can preload? images, CSS, fonts? // TODO detect other stuff we can preload? images, CSS, fonts?
@@ -532,7 +533,6 @@ function get_page_handler(
.replace('%sapper.styles%', () => styles); .replace('%sapper.styles%', () => styles);
res.statusCode = status; res.statusCode = status;
res.setHeader('Cache-Control', dev() ? 'no-cache' : 'max-age=600');
res.end(body); res.end(body);
}).catch(err => { }).catch(err => {
if (error) { if (error) {

12
test/common/test.js
View File

@@ -5,6 +5,7 @@ const Nightmare = require('nightmare');
const walkSync = require('walk-sync'); const walkSync = require('walk-sync');
const rimraf = require('rimraf'); const rimraf = require('rimraf');
const ports = require('port-authority'); const ports = require('port-authority');
const fetch = require('node-fetch');
Nightmare.action('page', { Nightmare.action('page', {
title(done) { title(done) {
@@ -800,15 +801,20 @@ function run({ mode, basepath = '' }) {
}); });
describe('headers', () => { describe('headers', () => {
it('sets Content-Type and Link...preload headers', () => { it('sets Content-Type, Link...preload, and Cache-Control headers', () => {
return capture(() => nightmare.goto(base)).then(requests => { return capture(() => fetch(base)).then(responses => {
const { headers } = requests[0]; const { headers } = responses[0];
assert.equal( assert.equal(
headers['content-type'], headers['content-type'],
'text/html' 'text/html'
); );
assert.equal(
headers['cache-control'],
'max-age=600'
);
const str = ['main', '.+?\\.\\d+'] const str = ['main', '.+?\\.\\d+']
.map(file => { .map(file => {
return `<${basepath}/client/[^/]+/${file}\\.js>;rel="preload";as="script"`; return `<${basepath}/client/[^/]+/${file}\\.js>;rel="preload";as="script"`;