Merge branch '3.99' into 4.0

This commit is contained in:
Steve Gravrock
2021-11-26 13:27:57 -08:00
8 changed files with 34 additions and 9 deletions

View File

@@ -991,7 +991,7 @@ getJasmineRequireObj().Spec = function(j$) {
if (this.message) {
this.excludeMessage = message;
}
this.pend();
this.pend(message);
};
Spec.prototype.getResult = function() {
@@ -3712,8 +3712,8 @@ getJasmineRequireObj().Deprecator = function(j$) {
}
var verboseNote =
'Note: This message will be shown only once. ' +
'Set config.verboseDeprecations to true to see every occurrence.';
'Note: This message will be shown only once. Set the verboseDeprecations ' +
'config property to true to see every occurrence.';
Deprecator.prototype.verboseDeprecations = function(enabled) {
this.verbose_ = enabled;