From a6e759c12cfaf54f16812a488990b849af24b406 Mon Sep 17 00:00:00 2001 From: Brandon Byars Date: Tue, 6 Dec 2016 17:03:05 -0600 Subject: [PATCH] Removing remaining remnants of node v0 support --- build.bat | 4 ---- scripts/dist/createWindowsZip | 13 ++----------- src/views/docs/api/contracts/config.ejs | 2 +- test/models/abstractServerTest.js | 1 - 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/build.bat b/build.bat index 83ce1b3f7..361bb5ab0 100644 --- a/build.bat +++ b/build.bat @@ -1,9 +1,5 @@ @echo off -REM For node v0.12 and below, the jsdom installation included in npm install requires -REM python 2.7, and probably some other build tools, to install correctly on Windows -REM For node v4, jsdom requires no native dependencies - REM I want to test x86 and x64 zip files, but no need to retest default grunt task REM on x86. Appveyor doesn't give me an elegant way to explicitly define the matrix, REM so we'll just shortcut those nodes in the matrix diff --git a/scripts/dist/createWindowsZip b/scripts/dist/createWindowsZip index cfa32e640..158bc07cd 100755 --- a/scripts/dist/createWindowsZip +++ b/scripts/dist/createWindowsZip @@ -4,7 +4,6 @@ set -e ARCH=$1 MB_VERSION=$2 -NODE_MAJOR_VERSION=`node -v | sed -E -e 's/(v[0-9]+)\.[0-9]+\.[0-9]+/\1/'` cd dist @@ -14,17 +13,9 @@ NODE_VERSION=`node -v` MB_FILENAME=mountebank-v$MB_VERSION-win-$ARCH if [ "$ARCH" = 'x86' ]; then - if [ "$NODE_MAJOR_VERSION" = 'v0' ]; then - URL=https://nodejs.org/dist/$NODE_VERSION/node.exe - else - URL=https://nodejs.org/dist/$NODE_VERSION/win-x86/node.exe - fi + URL=https://nodejs.org/dist/$NODE_VERSION/win-x86/node.exe else - if [ "$NODE_MAJOR_VERSION" = 'v0' ]; then - URL=https://nodejs.org/dist/$NODE_VERSION/x64/node.exe - else - URL=https://nodejs.org/dist/$NODE_VERSION/win-x64/node.exe - fi + URL=https://nodejs.org/dist/$NODE_VERSION/win-x64/node.exe fi [ -e $MB_FILENAME ] && rm -rf $MB_FILENAME diff --git a/src/views/docs/api/contracts/config.ejs b/src/views/docs/api/contracts/config.ejs index b14dd7e60..fb6059326 100644 --- a/src/views/docs/api/contracts/config.ejs +++ b/src/views/docs/api/contracts/config.ejs @@ -11,7 +11,7 @@ "debug": true }, <%- indent(2) %>"process": { -<%- indent(4) %>"nodeVersion": "v0.10.21", +<%- indent(4) %>"nodeVersion": "v6.9.1", <%- indent(4) %>"architecture": "x64", "platform": "darwin", <%- indent(4) %>"rss": 29822976, diff --git a/test/models/abstractServerTest.js b/test/models/abstractServerTest.js index e9cf6d4d6..696472fbd 100644 --- a/test/models/abstractServerTest.js +++ b/test/models/abstractServerTest.js @@ -152,7 +152,6 @@ describe('AbstractServer', function () { baseServer.listeners('request')[0](socket, {}, function () { logger.debug.assertLogged('[test:3000] host:port => "full request"'); }); - // The delay is not needed in node v0.10; evidently it came on a later process tick in subsequent versions return Q.delay(1); }); });