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

Merge branch 'master' of https://github.com/mmmichl/jasmine into mmmichl-master

Browse Source 
- Merges #1283 from @mmmichl
This commit is contained in:
Gregg Van Hove
2017-03-14 17:47:02 -07:00
parent 5533d1a920 8807bbb850
commit a37b6c0d32
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1066,7 +1066,14 @@ getJasmineRequireObj().Env = function(j$) {
var message = 'Failed';
if (error) {
message += ': ';
message += error.message || error;
if (error.message) {
message += error.message;
} else if (jasmine.isString_(error)) {
message += error;
} else {
// pretty print all kind of objects. This includes arrays.
message += jasmine.pp(error);
}
}
currentRunnable().addExpectationResult(false, {

10
spec/core/integration/EnvSpec.js
View File

@@ -181,6 +181,12 @@ describe("Env integration", function() {
}
})]
}));
expect(specDone).toHaveBeenCalledWith(jasmine.objectContaining({
description: 'pretty prints objects',
failedExpectations: [jasmine.objectContaining({
message: 'Failed: Object({ prop: \'value\', arr: [ \'works\', true ] })'
})]
}));
done();
}
});
@@ -197,6 +203,10 @@ describe("Env integration", function() {
env.it('has a message and stack trace from an Error', function() {
env.fail(new Error('error message'));
});
env.it('pretty prints objects', function() {
env.fail({prop: 'value', arr: ['works', true]});
})
});
env.execute();

9
src/core/Env.js
View File

@@ -523,7 +523,14 @@ getJasmineRequireObj().Env = function(j$) {
var message = 'Failed';
if (error) {
message += ': ';
message += error.message || error;
if (error.message) {
message += error.message;
} else if (jasmine.isString_(error)) {
message += error;
} else {
// pretty print all kind of objects. This includes arrays.
message += jasmine.pp(error);
}
}
currentRunnable().addExpectationResult(false, {