From 4c043717a955ff82e0a9a2ef906715574d0078ca Mon Sep 17 00:00:00 2001 From: Steve Gravrock Date: Sat, 25 Sep 2021 12:11:20 -0700 Subject: [PATCH] Revert "Dogfood the new jasmine-npm completion interface" This works, but until the -npm 3.10.0 is out, it creates a chicken and egg problem where each of core 3.10.0 and -npm 3.10.0 needs to be released after the other. This reverts commit 1c9382c9907eff62cfa95aceef180fbf7d0c8b86. --- Gruntfile.js | 14 ++++---------- package.json | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index e50595cd..14077d78 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -40,17 +40,11 @@ module.exports = function(grunt) { jasmine = new Jasmine({jasmineCore: jasmineCore}); jasmine.loadConfigFile('./spec/support/jasmine.json'); + jasmine.onComplete(function(passed) { + done(passed); + }); - jasmine.exitOnCompletion = false; - jasmine.execute().then( - result => { - done(result.overallStatus === 'passed'); - }, - err => { - console.error(err); - exit(1); - } - ); + jasmine.execute(); } ); diff --git a/package.json b/package.json index 093c77fd..84dd9372 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "grunt-contrib-concat": "^1.0.1", "grunt-css-url-embed": "^1.11.1", "grunt-sass": "^3.0.2", - "jasmine": "github:jasmine/jasmine-npm#main", + "jasmine": "^3.4.0", "jasmine-browser-runner": "github:jasmine/jasmine-browser#main", "jsdom": "^15.0.0", "load-grunt-tasks": "^4.0.0",