Merge branch 'main' into 3.99

2020-09-14 18:39:32 -07:00
parent c39c110eca 795651d3b6
commit a1f1b4ae0f
82 changed files with 2725 additions and 1286 deletions
--- a/spec/core/ExceptionsSpec.js
+++ b/spec/core/ExceptionsSpec.js
@@ -29,8 +29,7 @@ describe('Exceptions:', function() {
      done();
    };

-    env.addReporter({ jasmineDone: expectations });
-    env.execute();
+    env.execute(null, expectations);
  });

  it('should handle exceptions thrown directly in top-level describe blocks and continue', function(done) {
@@ -53,7 +52,6 @@ describe('Exceptions:', function() {
      done();
    };

-    env.addReporter({ jasmineDone: expectations });
-    env.execute();
+    env.execute(null, expectations);
  });
 });