From 485938c9591907d23acc5520db010161f99a104a Mon Sep 17 00:00:00 2001 From: Hakan Dilek Date: Wed, 13 Jun 2018 16:42:42 +0200 Subject: [PATCH 1/3] introduce tape-run for better browserify/tape integration --- package.json | 3 ++- test/browserify.js | 39 --------------------------------------- test/run.js | 12 ++++++++++++ 3 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 test/browserify.js create mode 100644 test/run.js diff --git a/package.json b/package.json index ee2aa63..ff78347 100644 --- a/package.json +++ b/package.json @@ -12,10 +12,11 @@ "devDependencies": { "browserify": "^14.1.0", "tape": "^2.12.3", + "tape-run": "^4.0.0", "zeros": "~0.0.0" }, "scripts": { - "test": "tape test/*.js" + "test": "node test/run.js" }, "repository": { "type": "git", diff --git a/test/browserify.js b/test/browserify.js deleted file mode 100644 index 6c6910c..0000000 --- a/test/browserify.js +++ /dev/null @@ -1,39 +0,0 @@ -"use strict" - -var browserify = require("browserify") -var tape = require("tape") -var vm = require("vm") - -var cases = [ "test" ] - -bundleCasesFrom(0) - -function bundleCasesFrom(i) { - if (i>=cases.length) return - var b = browserify() - b.ignore("tape") - b.add(__dirname + "/" + cases[i] + ".js") - tape(cases[i], function(t) { // Without nested tests, the asynchronous nature of bundle causes issues with tape... - b.bundle(function(err, src) { - if(err) { - throw new Error("failed to bundle!") - } - vm.runInNewContext(src, { - test: t.test.bind(t), - Buffer: Buffer, - Int8Array: Int8Array, - Int16Array: Int16Array, - Int32Array: Int32Array, - Float32Array: Float32Array, - Float64Array: Float64Array, - Uint8Array: Uint8Array, - Uint16Array: Uint16Array, - Uint32Array: Uint32Array, - Uint8ClampedArray: Uint8ClampedArray, - console: { log: console.log.bind(console) } - }) - t.end() - }) - }) - bundleCasesFrom(i+1) -} diff --git a/test/run.js b/test/run.js new file mode 100644 index 0000000..eda42b1 --- /dev/null +++ b/test/run.js @@ -0,0 +1,12 @@ +var run = require('tape-run'); +var browserify = require('browserify'); + +var cases = [ "test" ] + +cases.forEach(test => { + browserify(__dirname + '/' + test + '.js') + .bundle() + .pipe(run()) + .on('results', console.log) + .pipe(process.stdout); +}); From ec6ed4669c77d581ec61c76b9e6d1310fe8743ca Mon Sep 17 00:00:00 2001 From: Hakan Dilek Date: Wed, 13 Jun 2018 16:48:31 +0200 Subject: [PATCH 2/3] update dependency versions --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ff78347..0016a62 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "cwise": "^1.0.10" }, "devDependencies": { - "browserify": "^14.1.0", - "tape": "^2.12.3", + "browserify": "^16.2.2", + "tape": "^4.9.1", "tape-run": "^4.0.0", - "zeros": "~0.0.0" + "zeros": "~1.0.0" }, "scripts": { "test": "node test/run.js" From 6868b7059f6d2d12b224e1d899455b7f1fa70f47 Mon Sep 17 00:00:00 2001 From: Hakan Dilek Date: Thu, 14 Jun 2018 08:34:53 +0200 Subject: [PATCH 3/3] xvfb for headles travis-ci testing --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index e8ec2fa..0806782 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +addons: + apt: + packages: + - xvfb language: node_js node_js: - "6" @@ -7,3 +11,7 @@ node_js: - "4.2" - "4.1" - "4.0" +install: + - export DISPLAY=':99.0' + - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & + - npm install