From 22c79df98daa372658afd56afb2ef76895ce00c3 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Sun, 26 Apr 2015 02:40:13 -0700 Subject: [PATCH] build(gulp): remove gulp-jasmine, run tests in a new process instead otherwise we see occasional failures due to require.cache and other global state collisions --- gulpfile.js | 23 +-- npm-shrinkwrap.clean.json | 187 ------------------------ npm-shrinkwrap.json | 289 -------------------------------------- package.json | 1 - 4 files changed, 12 insertions(+), 488 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index d0b8ce4ec6..f22c28c8b8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -362,7 +362,6 @@ gulp.task('serve/benchmarks_external.dart', pubserve(gulp, gulpPlugins, { // doc generation var Dgeni = require('dgeni'); var bower = require('bower'); -var jasmine = require('gulp-jasmine'); var webserver = require('gulp-webserver'); gulp.task('docs/bower', function() { @@ -408,11 +407,12 @@ function createDocsTasks(publicBuild) { return gulp.watch('docs/app/**/*', [taskPrefix + '/app']); }); - gulp.task(taskPrefix + '/test', function () { - return gulp.src('docs/**/*.spec.js') - .pipe(jasmine({ - includeStackTrace: true - })); + gulp.task(taskPrefix + '/test', function (done) { + fork('./tools/traceur-jasmine', ['docs/**/*.spec.js'], { + stdio: 'inherit' + }).on('close', function (exitCode) { + done(exitCode); + }); }); gulp.task(taskPrefix + '/serve', function() { @@ -501,11 +501,12 @@ gulp.task('test.server.dart', runServerDartTests(gulp, gulpPlugins, { // ----------------- // test builders -gulp.task('test.transpiler.unittest', function() { - return gulp.src('tools/transpiler/unittest/**/*.js') - .pipe(jasmine({ - includeStackTrace: true - })); +gulp.task('test.transpiler.unittest', function(done) { + fork('./tools/traceur-jasmine', ['tools/transpiler/unittest/**/*.js'], { + stdio: 'inherit' + }).on('close', function (exitCode) { + done(exitCode); + }); }); // ----------------- diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index a30b10aeaa..8bcfd28c51 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -4607,193 +4607,6 @@ } } }, - "gulp-jasmine": { - "version": "1.0.1", - "dependencies": { - "gulp-util": { - "version": "3.0.4", - "dependencies": { - "array-differ": { - "version": "1.0.0" - }, - "array-uniq": { - "version": "1.0.2" - }, - "beeper": { - "version": "1.0.0" - }, - "chalk": { - "version": "1.0.0", - "dependencies": { - "ansi-styles": { - "version": "2.0.1" - }, - "escape-string-regexp": { - "version": "1.0.3" - }, - "has-ansi": { - "version": "1.0.3", - "dependencies": { - "ansi-regex": { - "version": "1.1.1" - }, - "get-stdin": { - "version": "4.0.1" - } - } - }, - "strip-ansi": { - "version": "2.0.1", - "dependencies": { - "ansi-regex": { - "version": "1.1.1" - } - } - }, - "supports-color": { - "version": "1.3.1" - } - } - }, - "dateformat": { - "version": "1.0.11", - "dependencies": { - "get-stdin": { - "version": "4.0.1" - }, - "meow": { - "version": "3.1.0", - "dependencies": { - "camelcase-keys": { - "version": "1.0.0", - "dependencies": { - "camelcase": { - "version": "1.0.2" - }, - "map-obj": { - "version": "1.0.0" - } - } - }, - "indent-string": { - "version": "1.2.1", - "dependencies": { - "repeating": { - "version": "1.1.2", - "dependencies": { - "is-finite": { - "version": "1.0.0" - } - } - } - } - } - } - } - } - }, - "lodash._reescape": { - "version": "3.0.0" - }, - "lodash._reevaluate": { - "version": "3.0.0" - }, - "lodash._reinterpolate": { - "version": "3.0.0" - }, - "lodash.template": { - "version": "3.4.0", - "dependencies": { - "lodash._basecopy": { - "version": "3.0.0" - }, - "lodash._basetostring": { - "version": "3.0.0" - }, - "lodash._basevalues": { - "version": "3.0.0" - }, - "lodash._isiterateecall": { - "version": "3.0.5" - }, - "lodash.escape": { - "version": "3.0.0" - }, - "lodash.keys": { - "version": "3.0.5", - "dependencies": { - "lodash.isarguments": { - "version": "3.0.1" - }, - "lodash.isarray": { - "version": "3.0.1" - }, - "lodash.isnative": { - "version": "3.0.1" - } - } - }, - "lodash.restparam": { - "version": "3.6.0" - }, - "lodash.templatesettings": { - "version": "3.1.0" - } - } - }, - "multipipe": { - "version": "0.1.2", - "dependencies": { - "duplexer2": { - "version": "0.0.2", - "dependencies": { - "readable-stream": { - "version": "1.1.13", - "dependencies": { - "core-util-is": { - "version": "1.0.1" - }, - "isarray": { - "version": "0.0.1" - }, - "string_decoder": { - "version": "0.10.31" - }, - "inherits": { - "version": "2.0.1" - } - } - } - } - } - } - }, - "object-assign": { - "version": "2.0.0" - }, - "replace-ext": { - "version": "0.0.1" - } - } - }, - "require-uncached": { - "version": "1.0.2", - "dependencies": { - "caller-path": { - "version": "0.1.0", - "dependencies": { - "callsites": { - "version": "0.2.0" - } - } - }, - "resolve-from": { - "version": "1.0.0" - } - } - } - } - }, "gulp-load-plugins": { "version": "0.7.1", "dependencies": { diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 57b8762e44..6f748db0da 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -7114,295 +7114,6 @@ } } }, - "gulp-jasmine": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/gulp-jasmine/-/gulp-jasmine-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/gulp-jasmine/-/gulp-jasmine-1.0.1.tgz", - "dependencies": { - "gulp-util": { - "version": "3.0.4", - "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz", - "dependencies": { - "array-differ": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz" - }, - "array-uniq": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz" - }, - "beeper": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz" - }, - "chalk": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", - "dependencies": { - "ansi-styles": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz" - }, - "escape-string-regexp": { - "version": "1.0.3", - "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" - }, - "has-ansi": { - "version": "1.0.3", - "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", - "dependencies": { - "ansi-regex": { - "version": "1.1.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" - }, - "get-stdin": { - "version": "4.0.1", - "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" - } - } - }, - "strip-ansi": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz", - "dependencies": { - "ansi-regex": { - "version": "1.1.1", - "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" - } - } - }, - "supports-color": { - "version": "1.3.1", - "from": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz" - } - } - }, - "dateformat": { - "version": "1.0.11", - "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz", - "dependencies": { - "get-stdin": { - "version": "4.0.1", - "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" - }, - "meow": { - "version": "3.1.0", - "from": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.1.0.tgz", - "dependencies": { - "camelcase-keys": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz", - "dependencies": { - "camelcase": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz" - }, - "map-obj": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz" - } - } - }, - "indent-string": { - "version": "1.2.1", - "from": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz", - "dependencies": { - "repeating": { - "version": "1.1.2", - "from": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz", - "dependencies": { - "is-finite": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz" - } - } - } - } - } - } - } - } - }, - "lodash._reescape": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz" - }, - "lodash._reevaluate": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz" - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz" - }, - "lodash.template": { - "version": "3.4.0", - "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.4.0.tgz", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.4.0.tgz", - "dependencies": { - "lodash._basecopy": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz" - }, - "lodash._basetostring": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz" - }, - "lodash._basevalues": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz" - }, - "lodash._isiterateecall": { - "version": "3.0.5", - "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.5.tgz", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.5.tgz" - }, - "lodash.escape": { - "version": "3.0.0", - "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz" - }, - "lodash.keys": { - "version": "3.0.5", - "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.5.tgz", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.5.tgz", - "dependencies": { - "lodash.isarguments": { - "version": "3.0.1", - "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.1.tgz" - }, - "lodash.isarray": { - "version": "3.0.1", - "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.1.tgz" - }, - "lodash.isnative": { - "version": "3.0.1", - "from": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.1.tgz" - } - } - }, - "lodash.restparam": { - "version": "3.6.0", - "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.0.tgz", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.0.tgz" - }, - "lodash.templatesettings": { - "version": "3.1.0", - "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz" - } - } - }, - "multipipe": { - "version": "0.1.2", - "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "dependencies": { - "duplexer2": { - "version": "0.0.2", - "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "dependencies": { - "readable-stream": { - "version": "1.1.13", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", - "dependencies": { - "core-util-is": { - "version": "1.0.1", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, - "string_decoder": { - "version": "0.10.31", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - } - } - } - } - } - } - }, - "object-assign": { - "version": "2.0.0", - "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz" - }, - "replace-ext": { - "version": "0.0.1", - "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz" - } - } - }, - "require-uncached": { - "version": "1.0.2", - "from": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz", - "dependencies": { - "caller-path": { - "version": "0.1.0", - "from": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "dependencies": { - "callsites": { - "version": "0.2.0", - "from": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz" - } - } - }, - "resolve-from": { - "version": "1.0.0", - "from": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.0.tgz", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.0.tgz" - } - } - } - } - }, "gulp-load-plugins": { "version": "0.7.1", "from": "https://registry.npmjs.org/gulp-load-plugins/-/gulp-load-plugins-0.7.1.tgz", diff --git a/package.json b/package.json index d5f0785bbf..9abfa89ad0 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,6 @@ "gulp-clang-format": "^1.0.3", "gulp-concat": "^2.5.2", "gulp-connect": "~1.0.5", - "gulp-jasmine": "^1.0.1", "gulp-load-plugins": "^0.7.1", "gulp-rename": "^1.2.0", "gulp-sass": "^1.3.3",