diff --git a/test/index.html.jade b/test/index.html.jade index 76e96fc0..5c7c2cee 100644 --- a/test/index.html.jade +++ b/test/index.html.jade @@ -3,7 +3,7 @@ html head meta( charset="utf-8" ) meta( http-equiv="x-ua-compatible", content="ie=edge" ) - title h5ai #{pkg.version} test suite + title h5ai test suite - v#{pkg.version} meta( name="viewport", content="width=device-width, initial-scale=1" ) link( rel="stylesheet", href="h5ai-styles.css" ) link( rel="stylesheet", href="styles.css" ) @@ -11,8 +11,4 @@ html script( src="scripts.js" ) body - div#mocha-custom - a( href="index.html" ) h5ai #{pkg.version} - div.stats - div.progress div#mocha diff --git a/test/scripts.js b/test/scripts.js index 883b6ae9..55739ef1 100644 --- a/test/scripts.js +++ b/test/scripts.js @@ -1,42 +1,35 @@ // @include "lib/*.js" // @include "util/*.js" -(function () { -'use strict'; - $(function () { + 'use strict'; - modulejs.define('config', util.uniqObj()); - _.each(modulejs._private.instances, function (val, key) { - delete modulejs._private.instances[key]; + util.mockConfigModule(); + util.clearModulejs(); + util.setupMocha(); + + describe('all tests', function () { + + // @include "tests/premisses.js" + + describe('unit tests', function () { + + // @include "tests/unit/modulejs.js" + // @include "tests/unit/libs.js" + // @include "tests/unit/boot.js" + // @include "tests/unit/config.js" + + // @include "tests/unit/*/*.js" + }); + + describe('integration tests', function () { + + // @include "tests/integration/first.js" + + // @include "tests/integration/*/*.js" + }); }); util.pinHtml(); util.runMocha(); }); - -util.setupMocha(); - -describe('all tests', function () { - - // @include "tests/premisses.js" - - describe('unit tests', function () { - - // @include "tests/unit/modulejs.js" - // @include "tests/unit/libs.js" - // @include "tests/unit/boot.js" - // @include "tests/unit/config.js" - - // @include "tests/unit/*/*.js" - }); - - describe('integration tests', function () { - - // @include "tests/integration/first.js" - - // @include "tests/integration/*/*.js" - }); -}); - -}()); diff --git a/test/util/mocha.js b/test/util/mocha.js index 38b1e8e2..f3a73d5d 100644 --- a/test/util/mocha.js +++ b/test/util/mocha.js @@ -2,6 +2,13 @@ 'use strict'; var showOnlyFailures = false; +var template = + '
' + + '' + + '
' + + '
' + + '
'; + function toggleFailureFilter(ev) { @@ -84,6 +91,7 @@ function setupMocha() { function runMocha() { + $(template).appendTo('#mocha').find('a').text(document.title); mocha.run().on('test', onTest).on('end', onEnd); } diff --git a/test/util/modulejs.js b/test/util/modulejs.js new file mode 100644 index 00000000..6b7c549f --- /dev/null +++ b/test/util/modulejs.js @@ -0,0 +1,21 @@ +(function () { +'use strict'; + +function clearModulejs() { + + _.each(modulejs._private.instances, function (val, key) { + delete modulejs._private.instances[key]; + }); + +} + +function mockConfigModule() { + + modulejs.define('config', util.uniqObj()); +} + +window.util = window.util || {}; +window.util.clearModulejs = clearModulejs; +window.util.mockConfigModule = mockConfigModule; + +}());