From f929c9fa9636c940857d2a3236e718150c227f42 Mon Sep 17 00:00:00 2001 From: Xmader Date: Thu, 7 Nov 2019 17:06:24 -0500 Subject: [PATCH 1/2] upgrade vows to v0.8.3 tests can run on Node 12 --- package-lock.json | 33 +++++++++++++++++++++++++-------- package.json | 2 +- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4edd9239..23b7f955 100644 --- a/package-lock.json +++ b/package-lock.json @@ -805,9 +805,9 @@ } }, "diff": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz", - "integrity": "sha1-NDJ2MI7Jkbe8giZ+1VvBQR+XFmY=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", + "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==", "dev": true }, "dom-serializer": { @@ -2521,13 +2521,30 @@ } }, "vows": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/vows/-/vows-0.7.0.tgz", - "integrity": "sha1-3QBl8RC6DAptY+hEhRwyCBdtWGc=", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/vows/-/vows-0.8.3.tgz", + "integrity": "sha512-PVIxa/ovXhrw5gA3mz6M+ZF3PHlqX4tutR2p/y9NWPAaFVKcWBE8b2ktfr0opQM/qFmcOVWKjSCJVjnYOvjXhw==", "dev": true, "requires": { - "diff": "~1.0.3", - "eyes": ">=0.1.6" + "diff": "^4.0.1", + "eyes": "~0.1.6", + "glob": "^7.1.2" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } } }, "window-size": { diff --git a/package.json b/package.json index 5e38e525..1ffcfa7c 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "devDependencies": { "common-style": "^3.0.0", "request": "^2.88.0", - "vows": "~0.7.0" + "vows": "~0.8.3" }, "bugs": { "url": "https://github.com/nodeapps/http-server/issues" From 458e97b572347da7e4232d084095f84969c23e06 Mon Sep 17 00:00:00 2001 From: Xmader Date: Thu, 7 Nov 2019 17:09:09 -0500 Subject: [PATCH 2/2] fix vows hangs after all the tests pass add cleanup --- test/http-server-test.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/http-server-test.js b/test/http-server-test.js index 0a7f897f..e9826277 100644 --- a/test/http-server-test.js +++ b/test/http-server-test.js @@ -125,7 +125,13 @@ vows.describe('http-server').addBatch({ assert.equal(body.trim(), file.trim()); } } + }, + teardown: function (proxyServer) { + proxyServer.close(); } + }, + teardown: function (server) { + server.close(); } }, 'When cors is enabled': { @@ -156,6 +162,9 @@ vows.describe('http-server').addBatch({ 'response Access-Control-Allow-Headers should contain X-Test': function (err, res) { assert.ok(res.headers['access-control-allow-headers'].split(/\s*,\s*/g).indexOf('X-Test') >= 0, 204); } + }, + teardown: function (server) { + server.close(); } }, 'When gzip and brotli compression is enabled and a compressed file is available': { @@ -209,6 +218,9 @@ vows.describe('http-server').addBatch({ assert.equal(res.statusCode, 200); assert.equal(res.headers['content-encoding'], 'br'); } + }, + teardown: function (server) { + server.close(); } }, 'When http-server is listening on 8083 with username "good_username" and password "good_password"': { @@ -341,6 +353,9 @@ vows.describe('http-server').addBatch({ assert.equal(body.trim(), file.trim()); } } + }, + teardown: function (server) { + server.close(); } } }).export(module);