diff --git a/source/Ox.UI/js/Code/DocPage.js b/source/Ox.UI/js/Code/DocPage.js index 7019f19d..d8bcd8a2 100644 --- a/source/Ox.UI/js/Code/DocPage.js +++ b/source/Ox.UI/js/Code/DocPage.js @@ -184,6 +184,7 @@ Ox.DocPage = function(options, self) { ); if (section == 'tests') { item.tests.forEach(function(test) { + var isAsync = test.expected && /(.+Ox\.test\()/.test(test.statement); $elements.push( $('
') .addClass(className) @@ -193,23 +194,36 @@ Ox.DocPage = function(options, self) { + Ox.encodeHTMLEntities(test.statement) .replace(/ /g, ' ') .replace(/\n/g, '
\n  ') - + '' - ) - ); - test.expected && $elements.push( - $('
') - .addClass(className) - .css({marginLeft: (level * 32 + 16) + 'px'}) - .html( - '' + Ox.encodeHTMLEntities(test.actual || test.expected) + ( - test.passed === false - ? ' // expected: ' - + Ox.encodeHTMLEntities(test.expected) + + '' + + ( + test.passed === false && isAsync + ? ' // actual: ' + + Ox.encodeHTMLEntities(test.actual) + '' : '' - ) + '' + ) + + '' ) ); + if (test.expected) { + $elements.push( + $('
') + .addClass(className) + .css({marginLeft: (level * 32 + 16) + 'px'}) + .html( + '' + + Ox.encodeHTMLEntities(test.actual || test.expected) + + ( + test.passed === false && !isAsync + ? ' // expected: ' + + Ox.encodeHTMLEntities(test.expected) + + '' + : '' + ) + + '' + ) + ); + } }); } else if (section == 'source') { // fixme: not the right place to fix path