Merge branch '3.99' into 4.0

2021-10-02 09:52:43 -07:00
parent 35064cf60e 7f0087b805
commit 9c03d4d3e9
9 changed files with 223 additions and 16 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -34,17 +34,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();
    }
  );