diff --git a/2/test/testrunner.js b/2/test/testrunner.js deleted file mode 100644 index 4510429a..00000000 --- a/2/test/testrunner.js +++ /dev/null @@ -1,34 +0,0 @@ -console.log('Loading: test.html'); -var page = require('webpage').create(); -var url = '2/test/index.html'; -page.open(url, function (status) { - if (status === 'success') { - var results = page.evaluate(function() { - // remove the first node with the total from the following counts - var passed = Math.max(0, document.querySelectorAll('.pass').length - 1); - return { - // retrieve the total executed tests number - total: ''.concat( - passed, - ' blocks (', - document.querySelector('#wru strong').textContent.replace(/\D/g, ''), - ' single tests)' - ), - passed: passed, - failed: Math.max(0, document.querySelectorAll('.fail').length - 1), - errored: Math.max(0, document.querySelectorAll('.error').length - 1) - }; - }); - console.log('- - - - - - - - - -'); - console.log('total: ' + results.total); - console.log('- - - - - - - - - -'); - console.log('passed: ' + results.passed); - console.log('failed: ' + results.failed); - console.log('errored: ' + results.errored); - console.log('- - - - - - - - - -'); - if (0 < results.failed + results.errored) { - status = 'failed'; - } - } - phantom.exit(status === 'success' ? 0 : 1); -}); \ No newline at end of file diff --git a/package.json b/package.json index 9357408a..dd45c67d 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ }, "main": "./twemoji.npm.js", "scripts": { - "test": "phantomjs testrunner.js && phantomjs 2/test/testrunner.js" + "test": "phantomjs testrunner.js" } } diff --git a/testrunner.js b/testrunner.js index d66dee2a..9f4d8d61 100644 --- a/testrunner.js +++ b/testrunner.js @@ -1,34 +1,48 @@ -console.log('Loading: test.html'); -var page = require('webpage').create(); -var url = 'test.html'; -page.open(url, function (status) { - if (status === 'success') { - var results = page.evaluate(function() { - // remove the first node with the total from the following counts - var passed = Math.max(0, document.querySelectorAll('.pass').length - 1); - return { - // retrieve the total executed tests number - total: ''.concat( - passed, - ' blocks (', - document.querySelector('#wru strong').textContent.replace(/\D/g, ''), - ' single tests)' - ), - passed: passed, - failed: Math.max(0, document.querySelectorAll('.fail').length - 1), - errored: Math.max(0, document.querySelectorAll('.error').length - 1) - }; - }); - console.log('- - - - - - - - - -'); - console.log('total: ' + results.total); - console.log('- - - - - - - - - -'); - console.log('passed: ' + results.passed); - console.log('failed: ' + results.failed); - console.log('errored: ' + results.errored); - console.log('- - - - - - - - - -'); - if (0 < results.failed + results.errored) { - status = 'failed'; - } - } - phantom.exit(status === 'success' ? 0 : 1); -}); \ No newline at end of file +var + webpage = require('webpage'), + urls = [ + '2/test/index.html', + 'test.html' + ] +; + +(function test() {'use strict'; + var page, url = urls.shift(); + if (!url) return phantom.exit(0); + console.log('Loading: ' + url); + page = webpage.create(); + page.open(url, function (status) { + if (status === 'success') { + setTimeout(function () { + var results = page.evaluate(function() { + // remove the first node with the total from the following counts + var passed = Math.max(0, document.querySelectorAll('.pass').length - 1); + return { + // retrieve the total executed tests number + total: ''.concat( + passed, + ' blocks (', + document.querySelector('#wru strong').textContent.replace(/\D/g, ''), + ' single tests)' + ), + passed: passed, + failed: Math.max(0, document.querySelectorAll('.fail').length - 1), + errored: Math.max(0, document.querySelectorAll('.error').length - 1) + }; + }); + page.stop(); + page.close(); + console.log('- - - - - - - - - -'); + console.log('total: ' + results.total); + console.log('- - - - - - - - - -'); + console.log('passed: ' + results.passed); + console.log('failed: ' + results.failed); + console.log('errored: ' + results.errored); + console.log('- - - - - - - - - -'); + if (0 < results.failed + results.errored) { + phantom.exit(1); + } else test(); + }, 1000); + } else phantom.exit(1); + }); +}()); \ No newline at end of file