From 0f1d5646d5ac9960143f68a27d73227e01a0e7ab Mon Sep 17 00:00:00 2001 From: Rene Saarsoo Date: Mon, 23 Apr 2012 11:06:15 +0300 Subject: [PATCH] Enhance display of doctests results. Also run the tests in correct order, not in reverse order. --- template/app/view/doctests/Index.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/template/app/view/doctests/Index.js b/template/app/view/doctests/Index.js index 1220b88b..d491f828 100644 --- a/template/app/view/doctests/Index.js +++ b/template/app/view/doctests/Index.js @@ -125,13 +125,13 @@ Ext.define('Docs.view.doctests.Index', { return; } - if ((!config.fail) && (!config.pass)) { + if (config.fail + config.pass === 0) { Ext.ComponentQuery.query('#testcontainer', this)[0].setDisabled(true); } this.clearTestRunner(); var testRunner = this.getComponent('testrunner'); - var record = config.examples.pop(); + var record = config.examples.shift(); var example = testRunner.add( Ext.create('Docs.view.examples.Inline', { @@ -164,7 +164,7 @@ Ext.define('Docs.view.doctests.Index', { */ showResult: function(config) { var cls = 'doc-test-success', - total = config.pass + config.fail, + totalTested = config.pass+config.fail, testControls = this.getComponent('testcontainer').getComponent('testcontrols'); if (config.fail) { @@ -174,7 +174,7 @@ Ext.define('Docs.view.doctests.Index', { testControls.remove('testResult'); testControls.insert(0, { itemId: 'testResult', - html: '' + config.fail.toString() + '/' + total.toString() + ' tests failed' + html: '' + totalTested + '/' + config.total + ' examples tested, ' + config.fail + ' failures' }); if (config.examples.length < 1) { @@ -195,6 +195,7 @@ Ext.define('Docs.view.doctests.Index', { this.runExample({ pass: 0, fail: 0, + total: 1, examples: [record] }); }, @@ -212,6 +213,7 @@ Ext.define('Docs.view.doctests.Index', { this.runExample({ pass: 0, fail: 0, + total: examples.length, examples: examples }); }, -- GitLab