nested children

This commit is contained in:
Christopher Chedeau
2014-03-30 19:33:24 -07:00
parent 8713562160
commit cce3a4d830
3 changed files with 54 additions and 26 deletions

View File

@@ -810,7 +810,7 @@ getJasmineRequireObj().Any = function() {
if (this.expectedObject == Object) {
return typeof other == 'object';
}
if (this.expectedObject == Boolean) {
return typeof other == 'boolean';
}
@@ -1767,10 +1767,10 @@ getJasmineRequireObj().matchersUtil = function(j$) {
expected = args.slice(3),
englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); });
var message = "Expected " +
var message = "Expected \n " +
j$.pp(actual) +
(isNot ? " not " : " ") +
englishyPredicate;
(isNot ? " not " : " \n") +
englishyPredicate + "\n";
if (expected.length > 0) {
for (var i = 0; i < expected.length; i++) {