Merge branch '3.99' into 4.0

2021-09-08 21:04:10 -07:00
parent bbcb5ff42f be23836c9d
commit 15f7013f85
15 changed files with 561 additions and 78 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -34,11 +34,17 @@ module.exports = function(grunt) {
          jasmine = new Jasmine({jasmineCore: jasmineCore});

      jasmine.loadConfigFile('./spec/support/jasmine.json');
-      jasmine.onComplete(function(passed) {
-        done(passed);
-      });

-      jasmine.execute();
+      jasmine.exitOnCompletion = false;
+      jasmine.execute().then(
+        result => {
+          done(result.overallStatus === 'passed');
+        },
+        err => {
+          console.error(err);
+          exit(1);
+        }
+      );
    }
  );