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

Merge branch 'toString_fallback' of https://github.com/myitcv/jasmine into myitcv-toString_fallback

Browse Source
This commit is contained in:
Gregg Van Hove
2015-10-04 13:46:59 -07:00
parent 878325e2cf d0ad9b98cd
commit 6ee7fd6ced
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jasmine-core/jasmine.js
View File

@@ -1618,6 +1618,8 @@ getJasmineRequireObj().pp = function(j$) {
this.emitScalar('HTMLNode'); this.emitScalar('HTMLNode');
} else if (value instanceof Date) { } else if (value instanceof Date) {
this.emitScalar('Date(' + value + ')'); this.emitScalar('Date(' + value + ')');
} else if (value.toString && typeof value === 'object' && !(value instanceof Array) && value.toString !== Object.prototype.toString) {
this.emitScalar(value.toString());
} else if (j$.util.arrayContains(this.seen, value)) { } else if (j$.util.arrayContains(this.seen, value)) {
this.emitScalar('<circular reference: ' + (j$.isArray_(value) ? 'Array' : 'Object') + '>'); this.emitScalar('<circular reference: ' + (j$.isArray_(value) ? 'Array' : 'Object') + '>');
} else if (j$.isArray_(value) || j$.isA_('Object', value)) { } else if (j$.isArray_(value) || j$.isA_('Object', value)) {

8
spec/core/PrettyPrintSpec.js
View File

@@ -181,6 +181,14 @@ describe("j$.pp", function () {
expect(j$.pp(obj)).toEqual("strung"); expect(j$.pp(obj)).toEqual("strung");
}); });
it("should stringify objects that implement custom toString", function () {
var obj = {
toString: function () { return "my toString"; }
};
expect(j$.pp(obj)).toEqual("my toString");
});
it("should handle objects with null prototype", function() { it("should handle objects with null prototype", function() {
if (jasmine.getEnv().ieVersion < 9) { return; } if (jasmine.getEnv().ieVersion < 9) { return; }

2
src/core/PrettyPrinter.js
View File

@@ -30,6 +30,8 @@ getJasmineRequireObj().pp = function(j$) {
this.emitScalar('HTMLNode'); this.emitScalar('HTMLNode');
} else if (value instanceof Date) { } else if (value instanceof Date) {
this.emitScalar('Date(' + value + ')'); this.emitScalar('Date(' + value + ')');
} else if (value.toString && typeof value === 'object' && !(value instanceof Array) && value.toString !== Object.prototype.toString) {
this.emitScalar(value.toString());
} else if (j$.util.arrayContains(this.seen, value)) { } else if (j$.util.arrayContains(this.seen, value)) {
this.emitScalar('<circular reference: ' + (j$.isArray_(value) ? 'Array' : 'Object') + '>'); this.emitScalar('<circular reference: ' + (j$.isArray_(value) ? 'Array' : 'Object') + '>');
} else if (j$.isArray_(value) || j$.isA_('Object', value)) { } else if (j$.isArray_(value) || j$.isA_('Object', value)) {