Merge branch '3.99' into 4.0
This commit is contained in:
@@ -987,7 +987,7 @@ getJasmineRequireObj().Env = function(j$) {
|
||||
|
||||
var declarationError = null;
|
||||
try {
|
||||
specDefinitions.call(suite);
|
||||
specDefinitions.call(j$.deprecatingThisProxy(suite, self));
|
||||
} catch (e) {
|
||||
declarationError = e;
|
||||
}
|
||||
|
||||
32
src/core/deprecatingThisProxy.js
Normal file
32
src/core/deprecatingThisProxy.js
Normal file
@@ -0,0 +1,32 @@
|
||||
/* eslint-disable compat/compat */
|
||||
// TODO: Remove this in the next major release.
|
||||
getJasmineRequireObj().deprecatingThisProxy = function(j$) {
|
||||
var msg = "Access to 'this' in describe functions is deprecated.";
|
||||
|
||||
try {
|
||||
new Proxy({}, {});
|
||||
} catch (e) {
|
||||
// Environment does not support Poxy.
|
||||
return function(suite) {
|
||||
return suite;
|
||||
};
|
||||
}
|
||||
|
||||
function DeprecatingThisProxyHandler(env) {
|
||||
this._env = env;
|
||||
}
|
||||
|
||||
DeprecatingThisProxyHandler.prototype.get = function(target, prop, receiver) {
|
||||
this._env.deprecated(msg);
|
||||
return target[prop];
|
||||
};
|
||||
|
||||
DeprecatingThisProxyHandler.prototype.set = function(target, prop, value) {
|
||||
this._env.deprecated(msg);
|
||||
return (target[prop] = value);
|
||||
};
|
||||
|
||||
return function(suite, env) {
|
||||
return new Proxy(suite, new DeprecatingThisProxyHandler(env));
|
||||
};
|
||||
};
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user