Merge branch '3.99' into 4.0

2021-05-22 09:09:03 -07:00
parent 752441a66f 61fb353197
commit 5acddcda4a
8 changed files with 131 additions and 2 deletions
--- a/src/core/requireCore.js
+++ b/src/core/requireCore.js
@@ -43,6 +43,7 @@ var getJasmineRequireObj = (function(jasmineGlobal) {
    j$.Clock = jRequire.Clock();
    j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$);
    j$.Env = jRequire.Env(j$);
+    j$.deprecatingThisProxy = jRequire.deprecatingThisProxy(j$);
    j$.StackTrace = jRequire.StackTrace(j$);
    j$.ExceptionFormatter = jRequire.ExceptionFormatter(j$);
    j$.ExpectationFilterChain = jRequire.ExpectationFilterChain();