Don't report a deprecation when a runnable uses two forms of async
This was made into an error in 4.0, so the deprecation is redundant (and broken).
This commit is contained in:
@@ -8138,8 +8138,6 @@ getJasmineRequireObj().QueueRunner = function(j$) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
QueueRunner.prototype.diagnoseConflictingAsync_ = function(fn, retval) {
|
QueueRunner.prototype.diagnoseConflictingAsync_ = function(fn, retval) {
|
||||||
var msg;
|
|
||||||
|
|
||||||
if (retval && j$.isFunction_(retval.then)) {
|
if (retval && j$.isFunction_(retval.then)) {
|
||||||
// Issue a warning that matches the user's code.
|
// Issue a warning that matches the user's code.
|
||||||
// Omit the stack trace because there's almost certainly no user code
|
// Omit the stack trace because there's almost certainly no user code
|
||||||
@@ -8159,8 +8157,6 @@ getJasmineRequireObj().QueueRunner = function(j$) {
|
|||||||
'function to not return a promise.'
|
'function to not return a promise.'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.deprecated(msg, { omitStackTrace: true });
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -253,8 +253,6 @@ getJasmineRequireObj().QueueRunner = function(j$) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
QueueRunner.prototype.diagnoseConflictingAsync_ = function(fn, retval) {
|
QueueRunner.prototype.diagnoseConflictingAsync_ = function(fn, retval) {
|
||||||
var msg;
|
|
||||||
|
|
||||||
if (retval && j$.isFunction_(retval.then)) {
|
if (retval && j$.isFunction_(retval.then)) {
|
||||||
// Issue a warning that matches the user's code.
|
// Issue a warning that matches the user's code.
|
||||||
// Omit the stack trace because there's almost certainly no user code
|
// Omit the stack trace because there's almost certainly no user code
|
||||||
@@ -274,8 +272,6 @@ getJasmineRequireObj().QueueRunner = function(j$) {
|
|||||||
'function to not return a promise.'
|
'function to not return a promise.'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.deprecated(msg, { omitStackTrace: true });
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user