admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PrettyPrinter survives if objects throw in toString

Browse Source
This commit is contained in:
johnjbarton
2019-06-27 10:35:59 -07:00
parent 066162d6bc
commit 6324fda065
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/PrettyPrinter.js
View File

@@ -9,11 +9,16 @@ getJasmineRequireObj().pp = function(j$) {
function hasCustomToString(value) {
// value.toString !== Object.prototype.toString if value has no custom toString but is from another context (e.g.
// iframe, web worker)
return (
j$.isFunction_(value.toString) &&
value.toString !== Object.prototype.toString &&
value.toString() !== Object.prototype.toString.call(value)
);
try {
return (
j$.isFunction_(value.toString) &&
value.toString !== Object.prototype.toString &&
value.toString() !== Object.prototype.toString.call(value)
);
} catch (e) {
// The custom toString() threw.
return true;
}
}
PrettyPrinter.prototype.format = function(value) {
@@ -59,7 +64,11 @@ getJasmineRequireObj().pp = function(j$) {
!j$.isArray_(value) &&
hasCustomToString(value)
) {
this.emitScalar(value.toString());
try {
this.emitScalar(value.toString());
} catch (e) {
this.emitScalar('has-invalid-toString-method');
}
} else if (j$.util.arrayContains(this.seen, value)) {
this.emitScalar(
'<circular reference: ' +