mockaton 6.4.4 → 6.4.6

package/README.md

@@ -1,4 +1,5 @@
-# Mockaton
+<img src="src/mockaton-logo.svg" alt="Mockaton Logo" width="210" style="margin-top: 30px"/>
+
 _Mockaton_ is a mock server for developing and testing frontends.
 
 It scans a given directory for files following a specific
@@ -327,10 +328,14 @@ fetch(addr + '/mockaton/fallback', {
 
 ### Reset
 Re-initialize the collection. So if you added or removed mocks they
-will be considered. The selected mocks, cookies, and delays are
-back to default. But the `Config.proxyFalllback` is not affected.
+will be considered. The selected mocks, cookies, and delays go
+back to default, but `Config.proxyFalllback` is not affected.
 ```js
 fetch(addr + '/mockaton/reset', {
   method: 'PATCH'
 })
 ```
+
+## TODO
+- Dashboard. List `staticDir` and indicate if it’s overriding some mock.
+- Refactor Tests

package/Tests.js

@@ -165,7 +165,7 @@ async function runTests() {
 		'api/alternative(comment-2).GET.200.json',
 		JSON.stringify({ comment: 2 }))
 
-	await test422WhenUpdatingNonExistingMockAlternative()
+	await testBadRequestWhenUpdatingNonExistingMockAlternative()
 
 	await testAutogenerates500(
 		'/api/alternative',
@@ -288,13 +288,15 @@ async function testItUpdatesDelayAndFile(url, file, expectedBody) {
 	})
 }
 
-async function test422WhenUpdatingNonExistingMockAlternative() {
+async function testBadRequestWhenUpdatingNonExistingMockAlternative() {
 	await it('There are mocks for /api/the-route but not this one', async () => {
+		const missingFile = 'api/the-route(non-existing-variant).GET.200.json'
 		const res = await request(API.edit, {
 			method: 'PATCH',
-			body: JSON.stringify({ [DF.file]: 'api/the-route(non-existing-variant).GET.200.json' })
+			body: JSON.stringify({ [DF.file]: missingFile })
 		})
-		equal(res.status, 422)
+		equal(res.status, 400)
+		equal(await res.text(), `Missing Mock: ${missingFile}`)
 	})
 }
 

package/package.json

@@ -2,7 +2,7 @@
 	"name": "mockaton",
 	"description": "A deterministic server-side for developing and testing frontend clients",
 	"type": "module",
-	"version": "6.4.4",
+	"version": "6.4.6",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"license": "MIT",

package/src/Api.js

@@ -9,7 +9,7 @@ import { Config } from './Config.js'
 import { DF, API } from './ApiConstants.js'
 import { parseJSON } from './utils/http-request.js'
 import * as mockBrokersCollection from './mockBrokersCollection.js'
-import { sendOK, sendBadRequest, sendJSON, sendFile, sendUnprocessableContent } from './utils/http-response.js'
+import { sendOK, sendBadRequest, sendJSON, sendFile } from './utils/http-response.js'
 
 
 export const apiGetRequests = new Map([
@@ -18,6 +18,7 @@ export const apiGetRequests = new Map([
 	['/Dashboard.js', serveDashboardAsset],
 	['/Dashboard.css', serveDashboardAsset],
 	['/ApiConstants.js', serveDashboardAsset],
+	['/mockaton-logo.svg', serveDashboardAsset],
 	[API.mocks, listMockBrokers],
 	[API.cookies, listCookies],
 	[API.comments, listComments]
@@ -59,10 +60,9 @@ async function updateBroker(req, response) {
 		const body = await parseJSON(req)
 		const file = body[DF.file]
 		const broker = mockBrokersCollection.getBrokerByFilename(file)
-		if (!broker || !broker.mockExists(file)) {
-			sendUnprocessableContent(response, `Missing Mock: ${file}`)
-			return
-		}
+		if (!broker || !broker.mockExists(file))
+			throw `Missing Mock: ${file}`
+
 		if (DF.delayed in body)
 			broker.updateDelay(body[DF.delayed])
 		broker.updateFile(file)

package/src/Dashboard.css

@@ -63,10 +63,8 @@ menu {
 	margin-bottom: 12px;
 	gap: 14px;
 
-	h1 {
-		margin: 0;
-		margin-right: 12px;
-		font-size: 26px;
+	img {
+		margin-right: 16px;
 	}
 
 	label {
@@ -107,7 +105,7 @@ menu {
 	top: 0;
 	width: 50%;
 	margin-left: 16px;
-	
+
 	h2 {
 		padding-top: 20px;
 	}

package/src/Dashboard.js

@@ -54,7 +54,7 @@ function DevPanel(brokersByMethod, cookies, comments) {
 	return (
 		r('div', null,
 			r('menu', null,
-				r('h1', null, Strings.title),
+				r('img', { src: 'mockaton-logo.svg', width: 160 }),
 				r(CookieSelector, { list: cookies }),
 				r(BulkSelector, { comments }),
 				r(ResetButton)),

package/src/mockaton-logo.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 570 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m77 0.27c2.7 0 6 1.3 9.1 2.6 2.9 1.1 4.2 3.3 4.2 6.5v84c0 3.8-2.4 5.8-7.2 5.8s-7.2-2-7.2-5.8v-63l-3.5-0.36-20 64c-0.92 2.9-3.2 4.2-6.6 4.1-1.5-0.079-2.9-0.47-4-1.2-1.2-0.71-2-1.8-2.3-3.2l-8.8-29-5.3-17c-1.8-5.8-3.7-13-5.8-20l-3.5 0.48v63c0 3.8-2.4 5.8-7.2 5.8s-7.2-2-7.2-5.8v-84c0-3.1 1.4-5.2 4.2-6.5 3.1-1.3 5.9-1.8 8.7-1.7 1.3 0 2.5 0.16 3.7 0.48 1.3 0.33 2.5 0.82 3.6 1.5 1.1 0.57 2.2 1.3 3.1 2.3 0.92 0.92 1.6 2 2.1 3.2l19 65c1.4-4.8 2.9-9.9 4.4-16 1.6-5.9 3.2-11 4.7-17 1.6-5.9 3.2-11 4.7-17 1.7-5.7 3.2-11 4.5-16 0.48-1.1 1.2-2.2 2.1-3.1 0.89-0.89 1.9-1.7 3.1-2.2 1.1-0.65 2.3-1.2 3.5-1.5 1.3-0.33 2.6-0.48 3.7-0.48m35 30h-0.12c2.1-1.4 4.2-2.6 6.5-3.5 2.3-0.89 4.5-1.4 6.6-1.4h20c2.1 0 4.2 0.46 6.5 1.4 2.3 0.92 4.5 2.1 6.6 3.5h-0.12c2.1 1.5 3.7 3.5 4.8 6.1 1.1 2.5 1.7 5.3 1.7 8.6v35c0 6.6-2.2 12-6.6 15-4.3 3.1-8.6 4.6-13 4.6h-20c-2.1 0-4.2-0.36-6.5-1.1-2.3-0.72-4.4-1.9-6.5-3.5-4.4-3.1-6.6-8-6.6-15v-35c0-3.3 0.56-6.1 1.7-8.6 1.1-2.5 2.8-4.5 4.8-6.1m31 57c3.1 0 5.1-0.86 6.3-2.6 1.3-1.7 2-3.5 2-5.5v-35c0-2.1-0.66-3.8-2-5.5-1.3-1.7-3.4-2.6-6.3-2.6h-15c-3.1 0-5.2 0.86-6.5 2.6-1.3 1.7-1.9 3.5-1.9 5.5v35c0 2 0.62 3.8 1.9 5.5 1.3 1.7 3.5 2.6 6.5 2.6zm96-7.9c0 6.6-2.2 12-6.6 15-4.3 3.1-8.6 4.6-13 4.6h-21c-4.3 0-8.6-1.6-13-4.6-2-1.7-3.5-3.6-4.5-6.1s-1.6-5.4-1.6-8.7v-35c0-6.6 2.1-12 6.1-15 2.1-1.5 4.1-2.6 6.2-3.5 2.2-0.92 4.2-1.4 6.3-1.4h21c2 0 4.1 0.39 6.5 1.2 2.4 0.72 4.5 1.8 6.6 3.1 2 1.4 3.5 3.3 4.6 5.7 1.3 2.5 1.9 5.3 1.9 8.7v6.1c0 3.8-2.3 5.8-6.7 5.8-4.4 0-6.7-2-6.7-5.8v-5.2c0-2.1-0.66-3.8-2-5.5-1.3-1.7-3.4-2.6-6.3-2.6h-15c-3.1 0-5.2 0.86-6.5 2.6-1.3 1.7-1.9 3.5-1.9 5.5v35c0 2 0.62 3.8 1.9 5.5 1.3 1.7 3.5 2.6 6.5 2.6h15c3.1 0 5.1-0.86 6.3-2.6 1.3-1.7 2-3.5 2-5.5v-5.6c0-3.8 2.3-5.7 6.7-5.7 4.4 0 6.7 1.9 6.7 5.7zm57-53v0.12c1.5-1.7 3-2.6 4.4-2.6 0.79 0 1.6 0.21 2.3 0.61 0.79 0.33 1.7 0.82 2.6 1.5h-0.12c2 1.7 3 3.3 3 4.8 0 0.57-0.12 1.2-0.36 2-0.25 0.65-0.64 1.2-1.2 1.7l-38 44v16c0 3.8-2.3 5.7-6.7 5.7-4.4 0-6.7-1.9-6.7-5.7v-87c0-3.8 2.3-5.8 6.7-5.8 4.4 0 6.7 2 6.7 5.8v51c2.1-2.5 4.2-5 6.7-7.8 2.5-2.9 4.9-5.7 7.4-8.6 2.5-3 4.9-5.8 7.4-8.6 2.5-2.9 4.7-5.4 6.8-7.9m12 64c0.57 1.1 0.86 2.2 0.86 3.3 0 2.1-1.2 3.6-3.6 4.7-1.7 0.99-3.2 1.5-4.4 1.5-0.92 0-1.8-0.33-2.6-0.98-0.79-0.57-1.5-1.3-2-2.2l-12-24c-0.72-1.3-1.1-2.5-1.1-3.6 0-2.1 1.1-3.7 3.2-5.1 0.57-0.4 1.1-0.77 1.7-1.1 0.65-0.33 1.4-0.56 2.1-0.73 0.92-0.17 1.8-0.0033 2.6 0.48 0.79 0.48 1.5 1.2 2.1 2zm30 8.2c-2.5 0-4.9-0.33-7.2-0.98-2.3-0.72-4.5-1.8-6.6-3.1v0.12c-4-2.5-6-7.1-6-14v-6c0-3.4 0.56-6.2 1.7-8.7 1.3-2.5 3-4.5 5-6h-0.12c2.1-1.4 4.2-2.4 6.5-3.1 2.3-0.72 4.5-1.1 6.6-1.1h27v-11c0-2.1-0.66-3.8-2-5.5-1.3-1.7-3.4-2.6-6.3-2.6h-14c-3.1 0-5.2 0.76-6.5 2.3-1.1 1.5-1.7 3.2-1.7 5.2v0.98c0 4.2-2.3 6.3-6.8 6.3-4.5 0-6.8-2.1-6.8-6.3v-1.1c0-3.4 0.56-6.1 1.7-8.4 1.3-2.3 2.9-4.2 4.8-5.7h-0.12c2.1-1.4 4.3-2.6 6.6-3.5 2.4-0.92 4.6-1.4 6.7-1.4h19c2.1 0 4.2 0.46 6.5 1.4 2.4 0.92 4.5 2.1 6.6 3.5h-0.12c2.1 1.5 3.7 3.5 4.8 6.1 1.1 2.5 1.7 5.3 1.7 8.6v49c0 3.8-2.3 5.8-6.7 5.8-0.92 0-1.8-0.04-2.6-0.12-0.72-0.079-1.4-0.29-2.1-0.61-0.57-0.4-1.1-0.94-1.5-1.6-0.33-0.72-0.48-1.7-0.48-2.8l-0.12-27h-25c-1.8 0-3.2 0.21-4.1 0.61s-1.8 1.1-2.3 2c-0.65 1.4-1.2 2.5-1.5 3.3-0.25 0.72-0.36 1.6-0.36 2.6v4.7c0 2.1 0.62 3.7 1.9 4.8 1.3 1.1 3.5 1.6 6.6 1.6h14c3.1 0 4.5 1.9 4.5 5.7 0 1.7-0.36 3.1-1.1 4.1-0.72 1.1-1.9 1.6-3.5 1.6zm72-62v44c0 2.1 0.46 3.7 1.4 4.8 0.92 1.1 2.9 1.7 5.7 1.7h3.2c3.2 0 4.6 1.9 4.5 5.6 0 3.8-1.5 5.7-4.5 5.7h-4c-2.7 0-5-0.33-7.3-0.98-2.3-0.72-4.5-1.8-6.6-3.1v0.12c-4-2.7-6-7.2-6-14v-44h-4.7c-3 0-4.5-1.9-4.6-5.7 0-3.8 1.6-5.7 4.6-5.7h4.7v-13c0-3.8 2.3-5.8 6.9-5.8 4.4 0 6.7 2 6.7 5.8v13h9.9c3.2 0 4.6 1.9 4.5 5.7 0 3.8-1.5 5.7-4.5 5.7zm32-7h-0.12c2.1-1.4 4.2-2.6 6.5-3.5 2.3-0.89 4.5-1.4 6.6-1.4h20c2.1 0 4.2 0.46 6.5 1.4 2.3 0.92 4.5 2.1 6.6 3.5h-0.12c2.1 1.5 3.7 3.5 4.8 6.1 1.1 2.5 1.7 5.3 1.7 8.6v35c0 6.6-2.2 12-6.6 15-4.3 3.1-8.6 4.6-13 4.6h-20c-2.1 0-4.2-0.36-6.5-1.1-2.3-0.72-4.4-1.9-6.5-3.5-4.4-3.1-6.6-8-6.6-15v-35c0-3.3 0.56-6.1 1.7-8.6 1.1-2.5 2.8-4.5 4.8-6.1m31 57c3.1 0 5.1-0.86 6.3-2.6 1.3-1.7 2-3.5 2-5.5v-35c0-2.1-0.66-3.8-2-5.5-1.3-1.7-3.4-2.6-6.3-2.6h-15c-3.1 0-5.2 0.86-6.5 2.6-1.3 1.7-1.9 3.5-1.9 5.5v35c0 2 0.62 3.8 1.9 5.5 1.3 1.7 3.5 2.6 6.5 2.6zm80-48 0.12 0.12c-1.1-2-3.3-3-6.5-3h-15c-3.4 0-5.5 0.99-6.6 3-1.1 1.7-1.7 3.7-1.7 6l-0.32 48c0 3.8-2.3 5.8-6.7 5.8-4.4 0-6.7-2-6.7-5.8v-49c0-3.4 0.52-6.2 1.6-8.7 1.1-2.5 2.8-4.4 5-6 4.3-3.1 8.6-4.6 13-4.6h20c4.1 0 8.4 1.6 13 4.6 4.4 3.1 6.6 8 6.6 15v49c0 3.8-2.3 5.8-6.7 5.8s-6.7-2-6.7-5.8v-48c0-2.1-0.66-4.1-2-6.1" aria-label="Mockaton"/>
+</svg>

package/src/utils/http-response.js

@@ -51,7 +51,7 @@ export async function sendPartialContent(response, range, file) {
 export function sendBadRequest(response, error) {
 	console.error(error)
 	response.statusCode = 400
-	response.end()
+	response.end(error)
 }
 
 export function sendNotFound(response) {
@@ -59,12 +59,6 @@ export function sendNotFound(response) {
 	response.end()
 }
 
-export function sendUnprocessableContent(response, error) {
-	console.error(error)
-	response.statusCode = 422
-	response.end()
-}
-
 export function sendInternalServerError(response, error) {
 	console.error(error)
 	response.statusCode = 500