Skip to content

Make header tests just check a fresh response #52

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.

Sign up for GitHub

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
May 8, 2019
Merged

Make header tests just check a fresh response #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 12 additions & 38 deletions tests/headers.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,17 @@ import * as utils from '../utils.mjs'

const tests = []

function defaultResponseHeaders (validatorType, validatorValue, additionalHeaders) {
return [
['Cache-Control', `max-age=3600`],
['Date', 0],
[validatorType, validatorValue]
].concat(additionalHeaders)
}

function checkCached ({name, id, kind = 'required', configuredHeaders, expectedHeaders, unexpectedHeaders = []}) {
const etag = utils.httpContent(`${id}-etag-1`)
const etag1 = `"${etag}"`
const lm1 = utils.httpDate(Date.now(), -24 * 60 * 60)
tests.push({
name: `${name} with a \`Last-Modified\` validator?`,
id: `headers-lm-${id}`,
kind,
requests: [
{
response_headers: defaultResponseHeaders('Last-Modified', lm1, configuredHeaders),
setup: true,
pause_after: true
},
{
expected_type: 'cached',
expected_response_headers: expectedHeaders,
expected_response_headers_missing: unexpectedHeaders,
setup_tests: ['expected_type']
}
]
})
tests.push({
name: `${name} with an \`ETag\` validator?`,
id: `headers-etag-${id}`,
name: name,
id: `headers-${id}`,
kind,
requests: [
{
response_headers: defaultResponseHeaders('ETag', etag1, configuredHeaders),
response_headers: configuredHeaders.concat([
['Cache-Control', `max-age=3600`],
['Date', 0]
]),
setup: true,
pause_after: true
},
Expand Down Expand Up @@ -72,9 +46,9 @@ function checkCached ({name, id, kind = 'required', configuredHeaders, expectedH
['Upgrade'],
['WWW-Authenticate']
].forEach(function ([header, value = null]) {
if (value === null) value = utils.httpContent(`${header}-value`)
if (value === null) value = utils.httpContent(`${header}-store-value`)
checkCached({
name: `Does HTTP cache store \`${header}\``,
name: `Does HTTP cache store \`${header}\`?`,
id: `store-${header}`,
kind: 'check',
configuredHeaders: [[header, value]],
Expand All @@ -83,7 +57,7 @@ function checkCached ({name, id, kind = 'required', configuredHeaders, expectedH
})

checkCached({
name: 'Does `Connection` header inhibit caching listed headers',
name: 'Does `Connection` header inhibit caching listed headers?',
id: `omit-headers-listed-in-Connection`,
kind: 'check',
configuredHeaders: [
Expand All @@ -97,7 +71,7 @@ checkCached({
})

checkCached({
name: 'Does `Cache-Control: no-cache` inhibit caching listed headers',
name: 'Does `Cache-Control: no-cache` inhibit caching listed headers?',
id: `omit-headers-listed-in-Cache-Control-no-cache`,
configuredHeaders: [
['Cache-Control', 'no-cache="a, b"'],
Expand All @@ -110,8 +84,8 @@ checkCached({
})

export default {
name: 'Omit Headers From Cache',
name: 'Storing Headers',
id: 'headers',
description: 'These tests examine how caches omit headers from stored responses and check whether they conform to the existing requirements to omit headers, for example around [no-cache](https://httpwg.org/specs/rfc7234.html#cache-response-directive.no-cache).',
description: 'These tests examine how caches store headers in responses and check whether they conform to the existing requirements to omit headers, for example around [no-cache](https://httpwg.org/specs/rfc7234.html#cache-response-directive.no-cache).',
tests
}