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

Display the name of the constructor when pretty printing objects

Browse Source 
Fixes #598 [finishes #81228592]
This commit is contained in:
slackersoft
2014-12-16 12:56:04 -08:00
parent eca8d8f009
commit 7570bc422b
6 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,6 +138,10 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
return obj.nodeType > 0; return obj.nodeType > 0;
}; };
j$.fnNameFor = function(func) {
return func.name || func.toString().match(/^\s*function\s*(\w*)\s*\(/)[1];
};
j$.any = function(clazz) { j$.any = function(clazz) {
return new j$.Any(clazz); return new j$.Any(clazz);
}; };
@@ -1668,13 +1672,15 @@ getJasmineRequireObj().pp = function(j$) {
}; };
StringPrettyPrinter.prototype.emitObject = function(obj) { StringPrettyPrinter.prototype.emitObject = function(obj) {
var constructorName = obj.constructor ? j$.fnNameFor(obj.constructor) : 'null';
this.append(constructorName);
if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) {
this.append('Object');
return; return;
} }
var self = this; var self = this;
this.append('{ '); this.append('({ ');
var first = true; var first = true;
this.iterateObject(obj, function(property, isGetter) { this.iterateObject(obj, function(property, isGetter) {
@@ -1693,7 +1699,7 @@ getJasmineRequireObj().pp = function(j$) {
} }
}); });
this.append(' }'); this.append(' })');
}; };
StringPrettyPrinter.prototype.append = function(value) { StringPrettyPrinter.prototype.append = function(value) {
@@ -2731,7 +2737,7 @@ getJasmineRequireObj().toThrowError = function(j$) {
} }
if (errorMatcher.hasNoSpecifics()) { if (errorMatcher.hasNoSpecifics()) {
pass.message = 'Expected function not to throw an Error, but it threw ' + fnNameFor(thrown) + '.'; pass.message = 'Expected function not to throw an Error, but it threw ' + j$.fnNameFor(thrown) + '.';
return pass; return pass;
} }
@@ -2785,9 +2791,9 @@ getJasmineRequireObj().toThrowError = function(j$) {
} }
return { return {
errorTypeDescription: errorType ? fnNameFor(errorType) : 'an exception', errorTypeDescription: errorType ? j$.fnNameFor(errorType) : 'an exception',
thrownDescription: function(thrown) { thrownDescription: function(thrown) {
var thrownName = errorType ? fnNameFor(thrown.constructor) : 'an exception', var thrownName = errorType ? j$.fnNameFor(thrown.constructor) : 'an exception',
thrownMessage = ''; thrownMessage = '';
if (expected) { if (expected) {
@@ -2815,10 +2821,6 @@ getJasmineRequireObj().toThrowError = function(j$) {
}; };
} }
function fnNameFor(func) {
return func.name || func.toString().match(/^\s*function\s*(\w*)\s*\(/)[1];
}
function isStringOrRegExp(potential) { function isStringOrRegExp(potential) {
return potential instanceof RegExp || (typeof potential == 'string'); return potential instanceof RegExp || (typeof potential == 'string');
} }

28
spec/core/PrettyPrintSpec.js
View File

@@ -16,7 +16,7 @@ describe("j$.pp", function () {
it("should stringify arrays properly", function() { it("should stringify arrays properly", function() {
expect(j$.pp([1, 2])).toEqual("[ 1, 2 ]"); expect(j$.pp([1, 2])).toEqual("[ 1, 2 ]");
expect(j$.pp([1, 'foo', {}, jasmine.undefined, null])).toEqual("[ 1, 'foo', { }, undefined, null ]"); expect(j$.pp([1, 'foo', {}, jasmine.undefined, null])).toEqual("[ 1, 'foo', Object({ }), undefined, null ]");
}); });
it("should indicate circular array references", function() { it("should indicate circular array references", function() {
@@ -32,18 +32,18 @@ describe("j$.pp", function () {
}); });
it("should stringify objects properly", function() { it("should stringify objects properly", function() {
expect(j$.pp({foo: 'bar'})).toEqual("{ foo: 'bar' }"); expect(j$.pp({foo: 'bar'})).toEqual("Object({ foo: 'bar' })");
expect(j$.pp({foo:'bar', baz:3, nullValue: null, undefinedValue: jasmine.undefined})).toEqual("{ foo: 'bar', baz: 3, nullValue: null, undefinedValue: undefined }"); expect(j$.pp({foo:'bar', baz:3, nullValue: null, undefinedValue: jasmine.undefined})).toEqual("Object({ foo: 'bar', baz: 3, nullValue: null, undefinedValue: undefined })");
expect(j$.pp({foo: function () { expect(j$.pp({foo: function () {
}, bar: [1, 2, 3]})).toEqual("{ foo: Function, bar: [ 1, 2, 3 ] }"); }, bar: [1, 2, 3]})).toEqual("Object({ foo: Function, bar: [ 1, 2, 3 ] })");
}); });
it("should not include inherited properties when stringifying an object", function() { it("should not include inherited properties when stringifying an object", function() {
var SomeClass = function() {}; var SomeClass = function SomeClass() {};
SomeClass.prototype.foo = "inherited foo"; SomeClass.prototype.foo = "inherited foo";
var instance = new SomeClass(); var instance = new SomeClass();
instance.bar = "my own bar"; instance.bar = "my own bar";
expect(j$.pp(instance)).toEqual("{ bar: 'my own bar' }"); expect(j$.pp(instance)).toEqual("SomeClass({ bar: 'my own bar' })");
}); });
it("should not recurse objects and arrays more deeply than j$.MAX_PRETTY_PRINT_DEPTH", function() { it("should not recurse objects and arrays more deeply than j$.MAX_PRETTY_PRINT_DEPTH", function() {
@@ -53,15 +53,15 @@ describe("j$.pp", function () {
try { try {
j$.MAX_PRETTY_PRINT_DEPTH = 2; j$.MAX_PRETTY_PRINT_DEPTH = 2;
expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: Object } }"); expect(j$.pp(nestedObject)).toEqual("Object({ level1: Object({ level2: Object }) })");
expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, Array ] ]"); expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, Array ] ]");
j$.MAX_PRETTY_PRINT_DEPTH = 3; j$.MAX_PRETTY_PRINT_DEPTH = 3;
expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: { level3: Object } } }"); expect(j$.pp(nestedObject)).toEqual("Object({ level1: Object({ level2: Object({ level3: Object }) }) })");
expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, Array ] ] ]"); expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, Array ] ] ]");
j$.MAX_PRETTY_PRINT_DEPTH = 4; j$.MAX_PRETTY_PRINT_DEPTH = 4;
expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: { level3: { level4: 'leaf' } } } }"); expect(j$.pp(nestedObject)).toEqual("Object({ level1: Object({ level2: Object({ level3: Object({ level4: 'leaf' }) }) }) })");
expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, [ 4, 'leaf' ] ] ] ]"); expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, [ 4, 'leaf' ] ] ] ]");
} finally { } finally {
j$.MAX_PRETTY_PRINT_DEPTH = originalMaxDepth; j$.MAX_PRETTY_PRINT_DEPTH = originalMaxDepth;
@@ -73,7 +73,7 @@ describe("j$.pp", function () {
var frozenObject = {foo: {bar: 'baz'}}; var frozenObject = {foo: {bar: 'baz'}};
frozenObject.circular = frozenObject; frozenObject.circular = frozenObject;
frozenObject = Object.freeze(frozenObject); frozenObject = Object.freeze(frozenObject);
expect(j$.pp(frozenObject)).toEqual("{ foo: { bar: 'baz' }, circular: <circular reference: Object> }"); expect(j$.pp(frozenObject)).toEqual("Object({ foo: Object({ bar: 'baz' }), circular: <circular reference: Object> })");
} }
}); });
@@ -96,7 +96,7 @@ describe("j$.pp", function () {
it("should indicate circular object references", function() { it("should indicate circular object references", function() {
var sampleValue = {foo: 'hello'}; var sampleValue = {foo: 'hello'};
sampleValue.nested = sampleValue; sampleValue.nested = sampleValue;
expect(j$.pp(sampleValue)).toEqual("{ foo: 'hello', nested: <circular reference: Object> }"); expect(j$.pp(sampleValue)).toEqual("Object({ foo: 'hello', nested: <circular reference: Object> })");
}); });
it("should indicate getters on objects as such", function() { it("should indicate getters on objects as such", function() {
@@ -108,10 +108,10 @@ describe("j$.pp", function () {
}); });
} }
if (sampleValue.__defineGetter__) { if (sampleValue.__defineGetter__) {
expect(j$.pp(sampleValue)).toEqual("{ id: 1, calculatedValue: <getter> }"); expect(j$.pp(sampleValue)).toEqual("Object({ id: 1, calculatedValue: <getter> })");
} }
else { else {
expect(j$.pp(sampleValue)).toEqual("{ id: 1 }"); expect(j$.pp(sampleValue)).toEqual("Object({ id: 1 })");
} }
}); });
@@ -157,6 +157,6 @@ describe("j$.pp", function () {
var obj = Object.create(null); var obj = Object.create(null);
obj.foo = 'bar'; obj.foo = 'bar';
expect(j$.pp(obj)).toEqual("{ foo: 'bar' }"); expect(j$.pp(obj)).toEqual("null({ foo: 'bar' })");
}); });
}); });

2
spec/html/PrettyPrintHtmlSpec.js
View File

@@ -3,7 +3,7 @@ describe("j$.pp (HTML Dependent)", function () {
var sampleNode = document.createElement('div'); var sampleNode = document.createElement('div');
sampleNode.innerHTML = 'foo<b>bar</b>'; sampleNode.innerHTML = 'foo<b>bar</b>';
expect(j$.pp(sampleNode)).toEqual("HTMLNode"); expect(j$.pp(sampleNode)).toEqual("HTMLNode");
expect(j$.pp({foo: sampleNode})).toEqual("{ foo: HTMLNode }"); expect(j$.pp({foo: sampleNode})).toEqual("Object({ foo: HTMLNode })");
}); });
it("should print Firefox's wrapped native objects correctly", function() { it("should print Firefox's wrapped native objects correctly", function() {

8
src/core/PrettyPrinter.js
View File

@@ -97,13 +97,15 @@ getJasmineRequireObj().pp = function(j$) {
}; };
StringPrettyPrinter.prototype.emitObject = function(obj) { StringPrettyPrinter.prototype.emitObject = function(obj) {
var constructorName = obj.constructor ? j$.fnNameFor(obj.constructor) : 'null';
this.append(constructorName);
if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) {
this.append('Object');
return; return;
} }
var self = this; var self = this;
this.append('{ '); this.append('({ ');
var first = true; var first = true;
this.iterateObject(obj, function(property, isGetter) { this.iterateObject(obj, function(property, isGetter) {
@@ -122,7 +124,7 @@ getJasmineRequireObj().pp = function(j$) {
} }
}); });
this.append(' }'); this.append(' })');
}; };
StringPrettyPrinter.prototype.append = function(value) { StringPrettyPrinter.prototype.append = function(value) {

4
src/core/base.js
View File

@@ -37,6 +37,10 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
return obj.nodeType > 0; return obj.nodeType > 0;
}; };
j$.fnNameFor = function(func) {
return func.name || func.toString().match(/^\s*function\s*(\w*)\s*\(/)[1];
};
j$.any = function(clazz) { j$.any = function(clazz) {
return new j$.Any(clazz); return new j$.Any(clazz);
}; };

10
src/core/matchers/toThrowError.js
View File

@@ -31,7 +31,7 @@ getJasmineRequireObj().toThrowError = function(j$) {
} }
if (errorMatcher.hasNoSpecifics()) { if (errorMatcher.hasNoSpecifics()) {
pass.message = 'Expected function not to throw an Error, but it threw ' + fnNameFor(thrown) + '.'; pass.message = 'Expected function not to throw an Error, but it threw ' + j$.fnNameFor(thrown) + '.';
return pass; return pass;
} }
@@ -85,9 +85,9 @@ getJasmineRequireObj().toThrowError = function(j$) {
} }
return { return {
errorTypeDescription: errorType ? fnNameFor(errorType) : 'an exception', errorTypeDescription: errorType ? j$.fnNameFor(errorType) : 'an exception',
thrownDescription: function(thrown) { thrownDescription: function(thrown) {
var thrownName = errorType ? fnNameFor(thrown.constructor) : 'an exception', var thrownName = errorType ? j$.fnNameFor(thrown.constructor) : 'an exception',
thrownMessage = ''; thrownMessage = '';
if (expected) { if (expected) {
@@ -115,10 +115,6 @@ getJasmineRequireObj().toThrowError = function(j$) {
}; };
} }
function fnNameFor(func) {
return func.name || func.toString().match(/^\s*function\s*(\w*)\s*\(/)[1];
}
function isStringOrRegExp(potential) { function isStringOrRegExp(potential) {
return potential instanceof RegExp || (typeof potential == 'string'); return potential instanceof RegExp || (typeof potential == 'string');
} }