From 5884f2126077f5be0468e6add85d0d4b80c15f0c Mon Sep 17 00:00:00 2001 From: Andreas Lind Date: Wed, 5 Jul 2017 12:01:03 +0200 Subject: [PATCH 1/5] Travis: ditch ancient before_install hook that upgrades npm and cleans its cache It that seems to be causing trouble now because the latest npm does not support the oldest node versions we support, so let's see if we can avoid it altogether. https://travis-ci.org/unexpectedjs/unexpected-sinon/jobs/250276587#L141-L147 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2ebc78..8bc22db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,4 @@ language: node_js node_js: - "0.10" - "0.12" -before_install: "npm install -g npm && npm cache clean" script: "npm run-script travis" From 75f5ccefa02c84253f0bb11b8ceac437570b7969 Mon Sep 17 00:00:00 2001 From: Andreas Lind Date: Wed, 5 Jul 2017 12:02:23 +0200 Subject: [PATCH 2/5] Travis: Build with node.js 4, 6, 7, and 8 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8bc22db..2d38569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,8 @@ language: node_js node_js: - "0.10" - "0.12" + - "4" + - "6" + - "7" + - "8" script: "npm run-script travis" From 1b8880094ee7c04ef985fdb11d8eea6d8afe6eff Mon Sep 17 00:00:00 2001 From: Andreas Lind Date: Wed, 5 Jul 2017 17:59:06 +0200 Subject: [PATCH 3/5] Update unexpected-markdown to 1.7.2. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3896fe2..7f3625b 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,6 @@ "sinon": "1.17.7", "unexpected": "10.23.0", "unexpected-documentation-site-generator": "^4.2.3", - "unexpected-markdown": "1.4.1" + "unexpected-markdown": "1.7.2" } } From ee854427a7b3e7427adea7e073d2977d91ca18dd Mon Sep 17 00:00:00 2001 From: Andreas Lind Date: Wed, 5 Jul 2017 18:11:23 +0200 Subject: [PATCH 4/5] Fix Promise polyfilling --- bootstrap-unexpected-markdown.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap-unexpected-markdown.js b/bootstrap-unexpected-markdown.js index fcb894d..441008f 100644 --- a/bootstrap-unexpected-markdown.js +++ b/bootstrap-unexpected-markdown.js @@ -4,5 +4,7 @@ unexpected = require('unexpected'); unexpected.output.preferredWidth = 80; unexpected.installPlugin(require('./lib/unexpected-sinon')); require('./test/monkeyPatchSinonStackFrames'); -Promise = require('rsvp'); +if (typeof Promise === 'undefined') { + Promise = require('rsvp').Promise; +} sinon = require('sinon'); From 331be762354ee4b3029623a63862a537c0845581 Mon Sep 17 00:00:00 2001 From: Andreas Lind Date: Wed, 5 Jul 2017 18:26:01 +0200 Subject: [PATCH 5/5] Update unexpected-documentation-site-generator to 4.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f3625b..f168a18 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "serve": "*", "sinon": "1.17.7", "unexpected": "10.23.0", - "unexpected-documentation-site-generator": "^4.2.3", + "unexpected-documentation-site-generator": "4.5.0", "unexpected-markdown": "1.7.2" } }