mockaton 8.11.2 → 8.11.4

package/README.md

@@ -3,59 +3,66 @@
 ![NPM Version](https://img.shields.io/npm/v/mockaton)
 ![NPM Version](https://img.shields.io/npm/l/mockaton)
 
-Mockaton is an HTTP mock server with the goal of making
-your frontend development and testing easier—and a lot more fun.
+HTTP mock server for developing and testing frontends.
 
-With Mockaton you don’t need to write code for wiring your mocks.
-Instead, just place your mocks in a directory and it will be scanned
-for filenames following a convention similar to the URLs.
+## Convention over Code
 
-For example, for `/api/user/1234` the mock filename would be:
-```
-my-mocks-dir/api/user/[user-id].GET.200.json
-```
+With Mockaton you don’t need to write code for wiring mocks. Instead, it scans a
+given directory for mock filenames following a convention similar to the URLs.
 
+For example, for <code>/<b>api/user</b>/1234</code> the mock filename would be:
+<pre>
+<code>my-mocks-dir/<b>api/user</b>/[user-id].GET.200.json</code>
+</pre>
 
-## Dashboard
-In the dashboard you can select a mock variant for a particular route, among
-other features such as delaying responses, or triggering an autogenerated
-`500` (Internal Server Error). Nonetheless, there’s a programmatic API,
-which is handy for setting up tests  (see **Commander API** below).
+## Multiple Mock Variants
+You can have different mocks for a particular route by adding
+comments and/or using different status codes.
 
-<picture>
-  <source media="(prefers-color-scheme: light)" srcset="./pixaton-tests/pic-for-readme.vp830x800.light.gold.png">
-  <source media="(prefers-color-scheme: dark)" srcset="./pixaton-tests/pic-for-readme.vp830x800.dark.gold.png">
-  <img alt="Mockaton Dashboard" src="./pixaton-tests/pic-for-readme.vp830x800.light.gold.png">
-</picture>
 
+### Adding comments in filenames
+Comments are anything within parentheses, including them. They
+are ignored for URL purposes, so you can add as many as you want.
 
+<pre>
+api/login<b>(locked out user)</b>.POST.423.json
+api/login<b>(invalid login attempt)</b>.POST.401.json
+</pre>
 
-## Fallback to your Backend
-Mockaton can fallback to your real backend on routes you don’t have mocks
-for. For that, type your backend address in the **Fallback Backend** field.
+### Different response status code
+For instance, using a `4xx` or `5xx` status code for triggering error
+responses. Or `2xx` such as `204` (No Content) for testing collections without records.
+
+<pre>
+api/videos.GET.<b>204</b>.json
+api/videos.GET.<b>403</b>.json
+api/videos.GET.<b>500</b>.empty
+</pre>
 
-Similarly, if you already have mocks for a route you can check the
-☁️ **Cloud checkbox** and that route will be requested from your backend.
 
+## Fallback to your Backend
+Mockaton can fallback to your real backend on routes you don’t have
+mocks for, or on routes that have the ☁️ **Cloud Checkbox** checked.
 
-## Scrapping Mocks from you Backend
+
+### Scrapping Mocks from your Backend
 If you check **Save Mocks**, Mockaton will collect the responses that hit your backend.
-Those mocks will be saved to your `config.mocksDir` following the filename convention.
+They will be saved on your `config.mocksDir` following the filename convention.
 
 
-## Multiple Mock Variants
 
-### Adding comments in filenames
-Want to mock a locked-out user or an invalid login attempt? 
-Add a comment to the filename in parentheses. For example:
+## Dashboard
+On the dashboard you can select a mock variant for a particular route, delaying responses,
+and triggering an autogenerated `500` (Internal Server Error), among other features.
 
-<pre>
-api/login<b>(locked out user)</b>.POST.423.json
-</pre>
+Nonetheless, there’s a programmatic API see
+**Commander&nbsp;API** below, which is handy setting up tests.
 
-### Different response status code
-For instance, you can have mocks with a `4xx` or `5xx` status code for triggering
-error responses. Or with a `204` (No Content) for testing empty collections.
+<picture>
+  <source media="(prefers-color-scheme: light)" srcset="./pixaton-tests/pic-for-readme.vp830x800.light.gold.png">
+  <source media="(prefers-color-scheme: dark)" srcset="./pixaton-tests/pic-for-readme.vp830x800.dark.gold.png">
+  <img alt="Mockaton Dashboard" src="./pixaton-tests/pic-for-readme.vp830x800.light.gold.png">
+</picture>
 
 
 
@@ -82,24 +89,23 @@ node --import=tsx my-mockaton.js
 ```
 
 
-## Running the demo app (Vite)
+## Demo App (Vite)
 
 This is a minimal React + Vite + Mockaton app. It’s mainly a list of
 colors, which contains all of their possible states. For example,
 permutations for out-of-stock, new-arrival, and discontinued.
 
-Also, if you select the **Admin User** from the Mockaton dashboard,
-the color cards will have a Delete button as well.
-
 ```sh  
 git clone https://github.com/ericfortis/mockaton.git
 cd mockaton/demo-app-vite
 npm install 
+
 npm run mockaton
 npm run start
+# BTW, that directory has scripts for running Mockaton and Vite 
+# with one command in two terminals.
 ```
 
-By the way, that directory has scripts for opening Mockaton and Vite in one command.
 
 The app looks like this:
 
@@ -116,6 +122,7 @@ The app looks like this:
   - alerts
   - notifications
   - slow to build resources
+- Mocking third-party APIs
 
 ### Time Travel
 If you commit the mocks to your repo, it’s straightforward to bisect bugs and
@@ -556,5 +563,4 @@ await mockaton.reset()
 
 <div style="display: flex; align-items: center; gap: 20px">
   <img src="fixtures-mocks/api/user/avatar.GET.200.png" width="170"/>
-  <p style="font-size: 18px">“Mockaton”</p>
 </div>

package/package.json

@@ -2,13 +2,13 @@
 	"name": "mockaton",
 	"description": "A deterministic server-side for developing and testing frontend clients",
 	"type": "module",
-	"version": "8.11.2",
+	"version": "8.11.4",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",
 	"repository": "https://github.com/ericfortis/mockaton",
 	"scripts": {
-		"test": "node --test src/**.test.js",
+		"test": "node --test \"src/**/*.test.js\"",
 		"start": "node dev-mockaton.js",
 		"start:ts": "node --import=tsx dev-mockaton.js",
 		"pixaton": "node --test --import=./pixaton-tests/_setup.js --experimental-test-isolation=none \"pixaton-tests/**/*.test.js\"",
@@ -17,8 +17,5 @@
 	"optionalDependencies": {
 		"pixaton": ">=1.0.2",
 		"puppeteer": ">=24.1.1"
-	},
-	"devDependencies": {
-		"pixaton": "1.0.2"
 	}
 }

package/src/Dashboard.css

@@ -1,7 +1,7 @@
 :root {
 	--boxShadow1: 0 2px 1px -1px rgba(0, 0, 0, 0.15), 0 1px 1px 0 rgba(0, 0, 0, 0.15), 0 1px 3px 0 rgba(0, 0, 0, 0.1);
-	--radius: 4px;
-	--radiusSmall: 2px;
+	--radius: 28px;
+	--radiusSmall: 4px;
 }
 
 @media (prefers-color-scheme: light) {
@@ -17,7 +17,7 @@
 		--colorSecondaryAction: #555;
 		--colorDisabledMockSelector: #444;
 		--colorHover: #dfefff;
-		--colorLabel: #444;
+		--colorLabel: #555;
 		--colorLightRed: #ffe4ee;
 		--colorRed: #da0f00;
 		--colorText: #000;
@@ -89,7 +89,7 @@ select {
 	background: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%23888888'><path d='M16.59 8.59 12 13.17 7.41 8.59 6 10l6 6 6-6z'/></svg>") no-repeat;
 	background-color: var(--colorComboBoxBackground);
 	background-size: 16px;
-	background-position: 100% center;
+	background-position: 98% center;
 
 	&:enabled {
 		box-shadow: var(--boxShadow1);
@@ -115,12 +115,12 @@ select {
 	border-bottom: 1px solid rgba(127, 127, 127, 0.1);
 	background: var(--colorHeaderBackground);
 	box-shadow: var(--boxShadow1);
-	gap: 10px;
+	gap: 6px;
 
 	img {
 		width: 130px;
 		align-self: center;
-		margin-right: 22px;
+		margin-right: 20px;
 	}
 
 	.Field {
@@ -129,6 +129,7 @@ select {
 		span {
 			display: flex;
 			align-items: center;
+			margin-left: 6px;
 			color: var(--colorLabel);
 			font-size: 11px;
 			gap: 4px;
@@ -148,9 +149,9 @@ select {
 		select {
 			width: 100%;
 			height: 28px;
-			padding: 4px 8px;
+			padding: 4px 12px;
 			border-right: 3px solid transparent;
-			margin-top: 4px;
+			margin-top: 3px;
 			color: var(--colorText);
 			font-size: 11px;
 			box-shadow: var(--boxShadow1);
@@ -163,7 +164,7 @@ select {
 		}
 
 		&.GlobalDelayField {
-			width: 84px;
+			width: 88px;
 
 			input[type=number] {
 				padding-right: 0;
@@ -180,11 +181,7 @@ select {
 
 		&.FallbackBackend {
 			position: relative;
-			width: 210px;
-
-			input[type=url] {
-				padding: 0 6px;
-			}
+			width: 212px;
 
 			.SaveProxiedCheckbox {
 				position: absolute;
@@ -197,6 +194,10 @@ select {
 				font-size: 11px;
 				gap: 4px;
 
+				span {
+					margin-left: 0;
+				}
+
 				input:disabled + span {
 					opacity: 0.8;
 				}
@@ -281,10 +282,10 @@ select {
 
 .PreviewLink {
 	position: relative;
-	left: -6px;
+	left: -10px;
 	display: inline-block;
-	width: 272px;
-	padding: 8px 6px;
+	width: 282px;
+	padding: 8px 11px;
 	border-radius: var(--radius);
 	color: var(--colorAccent);
 	text-decoration: none;
@@ -301,14 +302,14 @@ select {
 .MockSelector {
 	width: 260px;
 	height: 30px;
-	padding-right: 5px;
-	padding-left: 16px;
+	padding-right: 11px;
+	padding-left: 17px;
 	border: 0;
 	text-align: right;
 	direction: rtl;
 	text-overflow: ellipsis;
 	font-size: 12px;
-	background-position: 2px center;
+	background-position: 5px center;
 
 	&.nonDefault {
 		font-weight: bold;
@@ -318,7 +319,7 @@ select {
 		background: var(--color4xxBackground);
 	}
 	&:disabled {
-		padding-right: 4px;
+		padding-right: 10px;
 		appearance: none;
 		background: transparent;
 		cursor: default;
@@ -367,8 +368,8 @@ select {
 	}
 
 	> svg {
-		width: 18px;
-		height: 18px;
+		width: 20px;
+		height: 20px;
 		stroke-width: 2.5px;
 		border-radius: 50%;
 		background: var(--colorSecondaryButtonBackground);
@@ -376,7 +377,7 @@ select {
 }
 
 .ProxyToggler {
-	padding: 1px 3px;
+	padding: 1px 4px;
 	background: var(--colorSecondaryButtonBackground);
 	border-radius: var(--radiusSmall);
 
@@ -415,8 +416,8 @@ select {
 	}
 
 	> svg {
-		width: 16px;
-		height: 16px;
+		width: 18px;
+		height: 18px;
 		stroke-width: 2px;
 		border-radius: var(--radiusSmall);
 	}
@@ -444,7 +445,7 @@ select {
 	}
 
 	> span {
-		padding: 4px;
+		padding: 5px 4px;
 		font-size: 10px;
 		font-weight: bold;
 		color: var(--colorSecondaryAction);

package/src/Dashboard.js

@@ -58,6 +58,7 @@ const CSS = {
 }
 
 const r = createElement
+const s = createSvgElement
 const mockaton = new Commander(window.location.origin)
 
 const PROGRESS_BAR_DELAY = 180
@@ -519,16 +520,15 @@ function onError(error) {
 
 function TimerIcon() {
 	return (
-		r('svg', { viewBox: '0 0 24 24' },
-			r('path', { d: 'm11 5.6 0.14 7.2 6 3.7' })))
+		s('svg', { viewBox: '0 0 24 24' },
+			s('path', { d: 'm11 5.6 0.14 7.2 6 3.7' })))
 }
 
 function CloudIcon() {
 	return (
-		r('svg', { viewBox: '0 0 24 24' },
-			r('path', { d: 'm6.1 8.9c0.98-2.3 3.3-3.9 6-3.9 3.3-2e-7 6 2.5 6.4 5.7 0.018 0.15 0.024 0.18 0.026 0.23 0.0016 0.037 8.2e-4 0.084 0.098 0.14 0.097 0.054 0.29 0.05 0.48 0.05 2.2 0 4 1.8 4 4s-1.8 4-4 4c-4-0.038-9-0.038-13-0.018-2.8 0-5-2.2-5-5-2.2e-7 -2.8 2.2-5 5-5 2.8 2e-7 5 2.2 5 5' }),
-			r('path', { d: 'm6.1 9.1c2.8 0 5 2.3 5 5' })
-		))
+		s('svg', { viewBox: '0 0 24 24' },
+			s('path', { d: 'm6.1 8.9c0.98-2.3 3.3-3.9 6-3.9 3.3-2e-7 6 2.5 6.4 5.7 0.018 0.15 0.024 0.18 0.026 0.23 0.0016 0.037 8.2e-4 0.084 0.098 0.14 0.097 0.054 0.29 0.05 0.48 0.05 2.2 0 4 1.8 4 4s-1.8 4-4 4c-4-0.038-9-0.038-13-0.018-2.8 0-5-2.2-5-5-2.2e-7 -2.8 2.2-5 5-5 2.8 2e-7 5 2.2 5 5' }),
+			s('path', { d: 'm6.1 9.1c2.8 0 5 2.3 5 5' })))
 }
 
 
@@ -568,16 +568,12 @@ function cssClass(...args) {
 }
 
 
-// These are simplified React-compatible implementations.
-// IOW, for switching to React, remove the `createRoot`, `createElement`, `useRef`
+// These are simplified React-compatible implementations
 
 function createElement(elem, props = null, ...children) {
 	if (typeof elem === 'function')
 		return elem(props)
 
-	if (['svg', 'path'].includes(elem)) // Incomplete list
-		return createSvgElement(elem, props, children)
-
 	const node = document.createElement(elem)
 	if (props)
 		for (const [key, value] of Object.entries(props))

package/src/MockBroker.js

@@ -3,12 +3,10 @@ import { DEFAULT_500_COMMENT, DEFAULT_MOCK_COMMENT } from './ApiConstants.js'
 
 
 // MockBroker is a state for a particular route. It knows the available mock files
-// that can be served for the route, the currently selected file, and its delay.
+// that can be served for the route, the currently selected file, and if it’s delayed.
 export class MockBroker {
-	#urlRegex
 	constructor(file) {
-		const { urlMask } = parseFilename(file)
-		this.#urlRegex = new RegExp('^' + disregardVariables(removeQueryStringAndFragment(urlMask)) + '/*$')
+		this.urlMaskMatches = new UrlMatcher(file).urlMaskMatches
 		this.mocks = []
 		this.currentMock = {
 			file: '',
@@ -17,20 +15,44 @@ export class MockBroker {
 		this.register(file)
 	}
 
+	get file() { return this.currentMock.file }
+	get status() { return parseFilename(this.file).status }
+	get delayed() { return this.currentMock.delayed }
+	get proxied() { return !this.currentMock.file }
+	get temp500IsSelected() { return this.#isTemp500(this.file) }
+
+	hasMock(file) { return this.mocks.includes(file) }
+
 	register(file) {
 		if (parseFilename(file).status === 500) {
-			this.#deleteTemp500()
 			if (this.temp500IsSelected)
 				this.updateFile(file)
+			this.#deleteTemp500()
 		}
 		this.mocks.push(file)
 		this.#sortMocks()
 	}
 
-	#deleteTemp500() {
-		this.mocks = this.mocks.filter(file => !this.#isTemp500(file))
+	#deleteTemp500() { this.mocks = this.mocks.filter(file => !this.#isTemp500(file)) }
+
+	#isTemp500(file) { return includesComment(file, DEFAULT_500_COMMENT) }
+
+	#sortMocks() {
+		this.mocks.sort()
+		const defaults = this.mocks.filter(file => includesComment(file, DEFAULT_MOCK_COMMENT))
+		const temp500 = this.mocks.filter(file => includesComment(file, DEFAULT_500_COMMENT))
+		this.mocks = [
+			...defaults,
+			...this.mocks.filter(file => !defaults.includes(file) && !temp500.includes(file)),
+			...temp500
+		]
 	}
 
+	ensureItHas500() {
+		if (!this.#has500())
+			this.#registerTemp500()
+	}
+	#has500() { return this.mocks.some(mock => parseFilename(mock).status === 500) }
 	#registerTemp500() {
 		const { urlMask, method } = parseFilename(this.mocks[0])
 		const file = urlMask.replace(/^\//, '') // Removes leading slash
@@ -46,44 +68,18 @@ export class MockBroker {
 		return isEmpty
 	}
 
-	// Appending a '/' so URLs ending with variables don't match
-	// URLs that have a path after that variable. For example,
-	// without it, the following regex would match both of these URLs:
-	//   api/foo/[route_id] => api/foo/.*  (wrong match because it’s too greedy)
-	//   api/foo/[route_id]/suffix => api/foo/.*/suffix
-	// By the same token, the regex handles many trailing
-	// slashes. For instance, for routing api/foo/[id]?qs…
-	urlMaskMatches(url) {
-		return this.#urlRegex.test(removeQueryStringAndFragment(decodeURIComponent(url)) + '/')
+	selectDefaultFile() {
+		this.updateFile(this.mocks[0])
 	}
 
-	get file() { return this.currentMock.file }
-	get delayed() { return this.currentMock.delayed }
-	get proxied() { return !this.currentMock.file }
-	get status() { return parseFilename(this.file).status }
-	get temp500IsSelected() { return this.#isTemp500(this.file) }
-
-	#isTemp500(file) { return includesComment(file, DEFAULT_500_COMMENT) }
-
-	#sortMocks() {
-		this.mocks.sort()
-		const defaults = this.mocks.filter(file => includesComment(file, DEFAULT_MOCK_COMMENT))
-		const temp500 = this.mocks.filter(file => includesComment(file, DEFAULT_500_COMMENT))
-		this.mocks = [
-			...defaults,
-			...this.mocks.filter(file => !defaults.includes(file) && !temp500.includes(file)),
-			...temp500
-		]
+	updateFile(filename) {
+		this.currentMock.file = filename
 	}
 
-	selectDefaultFile() {
-		this.updateFile(this.mocks[0])
+	updateDelayed(delayed) {
+		this.currentMock.delayed = delayed
 	}
 
-	hasMock(file) { return this.mocks.includes(file) }
-	updateFile(filename) { this.currentMock.file = filename }
-	updateDelayed(delayed) { this.currentMock.delayed = delayed }
-
 	updateProxied(proxied) {
 		if (proxied)
 			this.updateFile('')
@@ -105,22 +101,43 @@ export class MockBroker {
 			comments.push(...extractComments(file))
 		return comments
 	}
+}
 
-	ensureItHas500() {
-		if (!this.#has500())
-			this.#registerTemp500()
+
+
+class UrlMatcher {
+	#urlRegex
+	constructor(file) {
+		this.#urlRegex = this.#buildUrlRegex(file)
 	}
-	#has500() {
-		return this.mocks.some(mock => parseFilename(mock).status === 500)
+
+	#buildUrlRegex(file) {
+		let { urlMask } = parseFilename(file)
+		urlMask = this.#removeQueryStringAndFragment(urlMask)
+		urlMask = this.#disregardVariables(urlMask)
+		return new RegExp('^' + urlMask + '/*$')
 	}
-}
 
-// Stars out (for regex) all the paths that are in square brackets
-function disregardVariables(urlMask) {
-	return urlMask.replace(/\[.*?]/g, '[^/]*')
-}
+	#removeQueryStringAndFragment(str) {
+		return str.replace(/[?#].*/, '')
+	}
 
-function removeQueryStringAndFragment(urlMask) {
-	return urlMask.replace(/[?#].*/, '')
+	#disregardVariables(str) { // Stars out all parts that are in square brackets
+		return str.replace(/\[.*?]/g, '[^/]*')
+	}
+
+	// Appending a '/' so URLs ending with variables don't match
+	// URLs that have a path after that variable. For example,
+	// without it, the following regex would match both of these URLs:
+	//   api/foo/[route_id] => api/foo/.*  (wrong match because it’s too greedy)
+	//   api/foo/[route_id]/suffix => api/foo/.*/suffix
+	// By the same token, the regex handles many trailing
+	// slashes. For instance, for routing api/foo/[id]?qs…
+	urlMaskMatches = (url) => {
+		let u = decodeURIComponent(url)
+		u = this.#removeQueryStringAndFragment(u)
+		u += '/'
+		return this.#urlRegex.test(u)
+	}
 }
 

package/src/MockDispatcher.js

@@ -34,7 +34,7 @@ export async function dispatchMock(req, response) {
 			: await applyPlugins(join(config.mocksDir, broker.file), req, response)
 
 		response.setHeader('Content-Type', mime)
-		setTimeout(() => response.end(body), Number(broker.delayed) * config.delay)
+		setTimeout(() => response.end(body), config.delay * broker.delayed)
 	}
 	catch (error) {
 		if (error instanceof BodyReaderError)

package/src/Mockaton.js

@@ -38,14 +38,7 @@ async function onRequest(req, response) {
 		response.setHeader('Server', 'Mockaton')
 
 		if (config.corsAllowed)
-			setCorsHeaders(req, response, {
-				origins: config.corsOrigins,
-				headers: config.corsHeaders,
-				methods: config.corsMethods,
-				maxAge: config.corsMaxAge,
-				credentials: config.corsCredentials,
-				exposedHeaders: config.corsExposedHeaders
-			})
+			setCorsHeaders(req, response, config)
 
 		const { url, method } = req
 

package/src/utils/http-cors.js

@@ -40,26 +40,26 @@ export function isPreflight(req) {
 
 
 export function setCorsHeaders(req, response, {
-	origins = [],
-	methods = [],
-	headers = [],
-	exposedHeaders = [],
-	credentials = false,
-	maxAge = 0
+	corsOrigins = [],
+	corsMethods = [],
+	corsHeaders = [],
+	corsExposedHeaders = [],
+	corsCredentials = false,
+	corsMaxAge = 0
 }) {
 	const reqOrigin = req.headers[CH.Origin]
-	const hasWildcard = origins.some(ao => ao === '*')
-	if (!reqOrigin || (!hasWildcard && !origins.includes(reqOrigin)))
+	const hasWildcard = corsOrigins.some(ao => ao === '*')
+	if (!reqOrigin || (!hasWildcard && !corsOrigins.includes(reqOrigin)))
 		return
 	response.setHeader(CH.AccessControlAllowOrigin, reqOrigin) // Never '*', so no need to `Vary` it
 
-	if (credentials)
+	if (corsCredentials)
 		response.setHeader(CH.AccessControlAllowCredentials, 'true')
 
 	if (req.headers[CH.AccessControlRequestMethod])
-		setPreflightSpecificHeaders(req, response, methods, headers, maxAge)
-	else if (exposedHeaders.length)
-		response.setHeader(CH.AccessControlExposeHeaders, exposedHeaders.join(','))
+		setPreflightSpecificHeaders(req, response, corsMethods, corsHeaders, corsMaxAge)
+	else if (corsExposedHeaders.length)
+		response.setHeader(CH.AccessControlExposeHeaders, corsExposedHeaders.join(','))
 }
 
 function setPreflightSpecificHeaders(req, response, methods, headers, maxAge) {

package/src/utils/http-cors.test.js

@@ -14,10 +14,10 @@ const AllowedDotCom = 'http://allowed.com'
 const NotAllowedDotCom = 'http://not-allowed.com'
 
 await describe('CORS', async () => {
-	let corsAllow = {}
+	let corsConfig = {}
 
 	const server = createServer((req, response) => {
-		setCorsHeaders(req, response, corsAllow)
+		setCorsHeaders(req, response, corsConfig)
 		if (isPreflight(req)) {
 			response.statusCode = 204
 			response.end()
@@ -82,9 +82,9 @@ await describe('CORS', async () => {
 
 	await describe('Preflight Response Headers', async () => {
 		await it('no origins allowed', async () => {
-			corsAllow = {
-				origins: [],
-				methods: ['GET']
+			corsConfig = {
+				corsOrigins: [],
+				corsMethods: ['GET']
 			}
 			const p = await preflight({
 				[CH.Origin]: FooDotCom,
@@ -98,9 +98,9 @@ await describe('CORS', async () => {
 		})
 
 		await it('not in allowed origins', async () => {
-			corsAllow = {
-				origins: [AllowedDotCom],
-				methods: ['GET']
+			corsConfig = {
+				corsOrigins: [AllowedDotCom],
+				corsMethods: ['GET']
 			}
 			const p = await preflight({
 				[CH.Origin]: NotAllowedDotCom,
@@ -113,9 +113,9 @@ await describe('CORS', async () => {
 		})
 
 		await it('origin and method match', async () => {
-			corsAllow = {
-				origins: [AllowedDotCom],
-				methods: ['GET']
+			corsConfig = {
+				corsOrigins: [AllowedDotCom],
+				corsMethods: ['GET']
 			}
 			const p = await preflight({
 				[CH.Origin]: AllowedDotCom,
@@ -128,9 +128,9 @@ await describe('CORS', async () => {
 		})
 
 		await it('origin matches from multiple', async () => {
-			corsAllow = {
-				origins: [AllowedDotCom, FooDotCom],
-				methods: ['GET']
+			corsConfig = {
+				corsOrigins: [AllowedDotCom, FooDotCom],
+				corsMethods: ['GET']
 			}
 			const p = await preflight({
 				[CH.Origin]: AllowedDotCom,
@@ -143,9 +143,9 @@ await describe('CORS', async () => {
 		})
 
 		await it('wildcard origin', async () => {
-			corsAllow = {
-				origins: ['*'],
-				methods: ['GET']
+			corsConfig = {
+				corsOrigins: ['*'],
+				corsMethods: ['GET']
 			}
 			const p = await preflight({
 				[CH.Origin]: FooDotCom,
@@ -158,10 +158,10 @@ await describe('CORS', async () => {
 		})
 
 		await it(`wildcard and credentials`, async () => {
-			corsAllow = {
-				origins: ['*'],
-				methods: ['GET'],
-				credentials: true
+			corsConfig = {
+				corsOrigins: ['*'],
+				corsMethods: ['GET'],
+				corsCredentials: true
 			}
 			const p = await preflight({
 				[CH.Origin]: FooDotCom,
@@ -174,11 +174,11 @@ await describe('CORS', async () => {
 		})
 
 		await it(`wildcard, credentials, and headers`, async () => {
-			corsAllow = {
-				origins: ['*'],
-				methods: ['GET'],
-				credentials: true,
-				headers: ['content-type', 'my-header']
+			corsConfig = {
+				corsOrigins: ['*'],
+				corsMethods: ['GET'],
+				corsCredentials: true,
+				corsHeaders: ['content-type', 'my-header']
 			}
 			const p = await preflight({
 				[CH.Origin]: FooDotCom,
@@ -193,9 +193,9 @@ await describe('CORS', async () => {
 
 	await describe('Non-Preflight (Actual Response) Headers', async () => {
 		await it('no origins allowed', async () => {
-			corsAllow = {
-				origins: [],
-				methods: ['GET']
+			corsConfig = {
+				corsOrigins: [],
+				corsMethods: ['GET']
 			}
 			const p = await request({
 				[CH.Origin]: NotAllowedDotCom
@@ -207,11 +207,11 @@ await describe('CORS', async () => {
 		})
 
 		await it('origin allowed', async () => {
-			corsAllow = {
-				origins: [AllowedDotCom],
-				methods: ['GET'],
-				credentials: true,
-				exposedHeaders: ['x-h1', 'x-h2']
+			corsConfig = {
+				corsOrigins: [AllowedDotCom],
+				corsMethods: ['GET'],
+				corsCredentials: true,
+				corsExposedHeaders: ['x-h1', 'x-h2']
 			}
 			const p = await request({
 				[CH.Origin]: AllowedDotCom