From 527fb87dadd1e677f132ca3db0b02825d5bd57e5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 17 Mar 2012 21:29:56 -0700 Subject: add /head --- js/tests/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/tests') diff --git a/js/tests/index.html b/js/tests/index.html index 8c710de36..2d59ab032 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -36,7 +36,7 @@ - +

Bootstrap Plugin Test Suite

-- cgit v1.2.3 From 83a7a698939b5b4cba3c04a86befc12b9005df3d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 15:33:28 -0700 Subject: typeahead should escape regexp special chars --- js/tests/unit/bootstrap-typeahead.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'js/tests') diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js index 96ea7c45f..25d313c85 100644 --- a/js/tests/unit/bootstrap-typeahead.js +++ b/js/tests/unit/bootstrap-typeahead.js @@ -52,6 +52,22 @@ $(function () { typeahead.$menu.remove() }) + test("should not explode when regex chars are entered", function () { + var $input = $('').typeahead({ + source: ['aa', 'ab', 'ac', 'mdo*', 'fat+'] + }) + , typeahead = $input.data('typeahead') + + $input.val('+') + typeahead.lookup() + + ok(typeahead.$menu.is(":visible"), 'typeahead is visible') + equals(typeahead.$menu.find('li').length, 1, 'has 1 item in menu') + equals(typeahead.$menu.find('.active').length, 1, 'one item is active') + + typeahead.$menu.remove() + }) + test("should hide menu when query entered", function () { stop() var $input = $('').typeahead({ -- cgit v1.2.3 From ef5ac02b698ffab3a42d21f20859b70df85543c0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 17:50:21 -0700 Subject: allow prevent default for show and hide event in modal --- js/tests/unit/bootstrap-modal.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'js/tests') diff --git a/js/tests/unit/bootstrap-modal.js b/js/tests/unit/bootstrap-modal.js index 22f5781ea..0851f64a7 100644 --- a/js/tests/unit/bootstrap-modal.js +++ b/js/tests/unit/bootstrap-modal.js @@ -29,6 +29,35 @@ $(function () { .modal("show") }) + test("should fire show event", function () { + stop() + $.support.transition = false + $("") + .bind("show", function () { + ok(true, "show was called") + }) + .bind("shown", function () { + $(this).remove() + start() + }) + .modal("show") + }) + + test("should not fire shown when default prevented", function () { + stop() + $.support.transition = false + $("") + .bind("show", function (e) { + e.preventDefault() + ok(true, "show was called") + start() + }) + .bind("shown", function () { + ok(false, "shown was called") + }) + .modal("show") + }) + test("should hide modal when hide is called", function () { stop() $.support.transition = false -- cgit v1.2.3 From bccc2cb7191eb54a4d67563625a748d7ecd381d4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 18:20:09 -0700 Subject: add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last --- js/tests/index.html | 2 ++ js/tests/unit/bootstrap-alert.js | 15 +++++++++++++++ js/tests/unit/bootstrap-carousel.js | 28 ++++++++++++++++++++++++++++ js/tests/unit/bootstrap-collapse.js | 15 +++++++++++++++ js/tests/unit/bootstrap-tab.js | 16 ++++++++++++++++ 5 files changed, 76 insertions(+) create mode 100644 js/tests/unit/bootstrap-carousel.js (limited to 'js/tests') diff --git a/js/tests/index.html b/js/tests/index.html index 2d59ab032..3e6cb9777 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -15,6 +15,7 @@ + @@ -28,6 +29,7 @@ + diff --git a/js/tests/unit/bootstrap-alert.js b/js/tests/unit/bootstrap-alert.js index e607f4340..7f24e0e6b 100644 --- a/js/tests/unit/bootstrap-alert.js +++ b/js/tests/unit/bootstrap-alert.js @@ -38,4 +38,19 @@ $(function () { ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom') }) + test("should not fire closed when close is prevented", function () { + $.support.transition = false + stop(); + $('
') + .bind('close', function (e) { + e.preventDefault(); + ok(true); + start(); + }) + .bind('closed', function () { + ok(false); + }) + .alert('close') + }) + }) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-carousel.js b/js/tests/unit/bootstrap-carousel.js new file mode 100644 index 000000000..92c23e227 --- /dev/null +++ b/js/tests/unit/bootstrap-carousel.js @@ -0,0 +1,28 @@ +$(function () { + + module("bootstrap-carousel") + + test("should be defined on jquery object", function () { + ok($(document.body).carousel, 'carousel method is defined') + }) + + test("should return element", function () { + ok($(document.body).carousel()[0] == document.body, 'document.body returned') + }) + + test("should not fire sliden when slide is prevented", function () { + $.support.transition = false + stop(); + $('
') + .bind('slide', function (e) { + e.preventDefault(); + ok(true); + start(); + }) + .bind('slid', function () { + ok(false); + }) + .carousel('next') + }) + +}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-collapse.js b/js/tests/unit/bootstrap-collapse.js index 698238d96..8e52898b5 100644 --- a/js/tests/unit/bootstrap-collapse.js +++ b/js/tests/unit/bootstrap-collapse.js @@ -22,4 +22,19 @@ $(function () { ok(/height/.test(el.attr('style')), 'has height set') }) + test("should not fire shown when show is prevented", function () { + $.support.transition = false + stop(); + $('
') + .bind('show', function (e) { + e.preventDefault(); + ok(true); + start(); + }) + .bind('shown', function () { + ok(false); + }) + .collapse('show') + }) + }) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-tab.js b/js/tests/unit/bootstrap-tab.js index 18f490fa5..987804781 100644 --- a/js/tests/unit/bootstrap-tab.js +++ b/js/tests/unit/bootstrap-tab.js @@ -42,4 +42,20 @@ $(function () { equals($("#qunit-fixture").find('.active').attr('id'), "home") }) + + test("should not fire closed when close is prevented", function () { + $.support.transition = false + stop(); + $('
') + .bind('show', function (e) { + e.preventDefault(); + ok(true); + start(); + }) + .bind('shown', function () { + ok(false); + }) + .tab('show') + }) + }) \ No newline at end of file -- cgit v1.2.3 From 4bd611884a5f1dd02878f73bccd51d85c1e49186 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 4 Apr 2012 14:58:04 -0700 Subject: detect if title in tooltip is text or html. if text - use `text` method to prevent xss. all add a few notes to js readme about updated event --- js/tests/unit/bootstrap-tooltip.js | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'js/tests') diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js index 8543162c6..f6e00089b 100644 --- a/js/tests/unit/bootstrap-tooltip.js +++ b/js/tests/unit/bootstrap-tooltip.js @@ -59,4 +59,28 @@ $(function () { ok(!$(".tooltip").length, 'tooltip removed') }) + test("should detect if title string is html or text: foo", function () { + ok(!$.fn.tooltip.Constructor.prototype.isHTML('foo'), 'correctly detected html') + }) + + test("should detect if title string is html or text: &lt;foo&gt;", function () { + ok(!$.fn.tooltip.Constructor.prototype.isHTML('<foo>'), 'correctly detected html') + }) + + test("should detect if title string is html or text: <div>foo</div>", function () { + ok($.fn.tooltip.Constructor.prototype.isHTML('
foo
'), 'correctly detected html') + }) + + test("should detect if title string is html or text: asdfa<div>foo</div>asdfasdf", function () { + ok($.fn.tooltip.Constructor.prototype.isHTML('asdfa
foo
asdfasdf'), 'correctly detected html') + }) + + test("should detect if title string is html or text: document.createElement('div')", function () { + ok($.fn.tooltip.Constructor.prototype.isHTML(document.createElement('div')), 'correctly detected html') + }) + + test("should detect if title string is html or text: $('<div />)", function () { + ok($.fn.tooltip.Constructor.prototype.isHTML($('
')), 'correctly detected html') + }) + }) \ No newline at end of file -- cgit v1.2.3 From 575f18aaf49abb0289185f6409bee031947ccf69 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 16:29:53 -0700 Subject: add jshint support + a few minor stylistic changes --- js/tests/unit/bootstrap-transition.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/tests') diff --git a/js/tests/unit/bootstrap-transition.js b/js/tests/unit/bootstrap-transition.js index 3f28d2676..086773fa2 100644 --- a/js/tests/unit/bootstrap-transition.js +++ b/js/tests/unit/bootstrap-transition.js @@ -3,7 +3,7 @@ $(function () { module("bootstrap-transition") test("should be defined on jquery support object", function () { - ok($.support.transition != undefined, 'transition object is defined') + ok($.support.transition !== undefined, 'transition object is defined') }) test("should provide an end object", function () { -- cgit v1.2.3 From c291e4d78681b5111b4a2c7f480bd7bf18abc34c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 16:32:20 -0700 Subject: fix typeahead test --- js/tests/unit/bootstrap-typeahead.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/tests') diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js index 25d313c85..4e2428d6a 100644 --- a/js/tests/unit/bootstrap-typeahead.js +++ b/js/tests/unit/bootstrap-typeahead.js @@ -107,7 +107,7 @@ $(function () { ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active") $input.trigger({ - type: 'keypress' + type: 'keydown' , keyCode: 40 }) @@ -115,7 +115,7 @@ $(function () { $input.trigger({ - type: 'keypress' + type: 'keydown' , keyCode: 38 }) -- cgit v1.2.3 From d65f7f204a918906d7ce5120b9719abf105d60c5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 21:44:57 -0700 Subject: don't open dropdown if target is disabled --- js/tests/unit/bootstrap-dropdown.js | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'js/tests') diff --git a/js/tests/unit/bootstrap-dropdown.js b/js/tests/unit/bootstrap-dropdown.js index 368ced2a5..4e52c8485 100644 --- a/js/tests/unit/bootstrap-dropdown.js +++ b/js/tests/unit/bootstrap-dropdown.js @@ -10,6 +10,40 @@ $(function () { ok($(document.body).dropdown()[0] == document.body, 'document.body returned') }) + test("should not open dropdown if target is disabled", function () { + var dropdownHTML = '' + , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() + + ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + }) + + test("should not open dropdown if target is disabled", function () { + var dropdownHTML = '' + , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() + + ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + }) + test("should add class open to menu if clicked", function () { var dropdownHTML = '
    ' + '
  • ' -- cgit v1.2.3 From b14455b03a977cbbf99112d39b55461785666a3f Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 23:10:03 -0700 Subject: add tests for mouseout delay in tooltip --- js/tests/unit/bootstrap-tooltip.js | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'js/tests') diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js index f6e00089b..63f4f0b07 100644 --- a/js/tests/unit/bootstrap-tooltip.js +++ b/js/tests/unit/bootstrap-tooltip.js @@ -59,6 +59,56 @@ $(function () { ok(!$(".tooltip").length, 'tooltip removed') }) + test("should not show tooltip if leave event occurs before delay expires", function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: 200 }) + + stop() + + tooltip.trigger('mouseenter') + + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + tooltip.trigger('mouseout') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + start() + }, 200) + }, 100) + }) + + test("should not show tooltip if leave event occurs before delay expires", function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: 100 }) + stop() + tooltip.trigger('mouseenter') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + tooltip.trigger('mouseout') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + start() + }, 100) + }, 50) + }) + + test("should show tooltip if leave event hasn't occured before delay expires", function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: 200 }) + stop() + tooltip.trigger('mouseenter') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip is not faded in') + setTimeout(function () { + ok(!$(".tooltip").hasClass('fade in'), 'tooltip has faded in') + start() + }, 200) + }, 100) + }) + test("should detect if title string is html or text: foo", function () { ok(!$.fn.tooltip.Constructor.prototype.isHTML('foo'), 'correctly detected html') }) -- cgit v1.2.3 From 03f78f7a60a631c01c1fb085b01d98bee61d7bb6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 19 Apr 2012 17:34:07 -0700 Subject: run qunit tests in phantomjs for travis-ci --- js/tests/index.html | 3 ++ js/tests/phantom.js | 65 ++++++++++++++++++++++++++++++++++++++ js/tests/server.js | 18 +++++++++++ js/tests/unit/bootstrap-phantom.js | 21 ++++++++++++ 4 files changed, 107 insertions(+) create mode 100644 js/tests/phantom.js create mode 100644 js/tests/server.js create mode 100644 js/tests/unit/bootstrap-phantom.js (limited to 'js/tests') diff --git a/js/tests/index.html b/js/tests/index.html index 3e6cb9777..2f8f71b12 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -11,6 +11,9 @@ + + + diff --git a/js/tests/phantom.js b/js/tests/phantom.js new file mode 100644 index 000000000..f172e7cbc --- /dev/null +++ b/js/tests/phantom.js @@ -0,0 +1,65 @@ +/* + * Simple phantom.js integration script + * Adapted from Modernizr + */ + +function waitFor(testFx, onReady, timeOutMillis) { + var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001, //< Default Max Timout is 3s + start = new Date().getTime(), + condition = false, + interval = setInterval(function() { + if ( (new Date().getTime() - start < maxtimeOutMillis) && !condition ) { + // If not time-out yet and condition not yet fulfilled + condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()); //< defensive code + } else { + if(!condition) { + // If condition still not fulfilled (timeout but condition is 'false') + console.log("'waitFor()' timeout"); + phantom.exit(1); + } else { + // Condition fulfilled (timeout and/or condition is 'true') + typeof(onReady) === "string" ? eval(onReady) : onReady(); //< Do what it's supposed to do once the condition is fulfilled + clearInterval(interval); //< Stop this interval + } + } + }, 100); //< repeat check every 250ms +}; + + +if (phantom.args.length === 0 || phantom.args.length > 2) { + console.log('Usage: phantom.js URL'); + phantom.exit(); +} + +var page = new WebPage(); + +// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this") +page.onConsoleMessage = function(msg) { + console.log(msg); +}; + +page.open(phantom.args[0], function(status){ + if (status !== "success") { + console.log("Unable to access network"); + phantom.exit(); + } else { + waitFor(function(){ + return page.evaluate(function(){ + var el = document.getElementById('qunit-testresult'); + if (el && el.innerText.match('completed')) { + return true; + } + return false; + }); + }, function(){ + var failedNum = page.evaluate(function(){ + var el = document.getElementById('qunit-testresult'); + try { + return el.getElementsByClassName('failed')[0].innerHTML; + } catch (e) { } + return 10000; + }); + phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0); + }); + } +}); \ No newline at end of file diff --git a/js/tests/server.js b/js/tests/server.js new file mode 100644 index 000000000..27d1bf24b --- /dev/null +++ b/js/tests/server.js @@ -0,0 +1,18 @@ +/* + * Simple connect server for phantom.js + * Adapted from Modernizr + */ + +var connect = require('connect') + , args = process.argv.slice(2) + , fs = require('fs') + , folder = '/../../' + , port = '3000' + +var server = connect.createServer( + connect.static(__dirname + folder) +).listen(port) + +fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8') + +console.log("Server started on port %s in %s", port, folder) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-phantom.js b/js/tests/unit/bootstrap-phantom.js new file mode 100644 index 000000000..8bed5f603 --- /dev/null +++ b/js/tests/unit/bootstrap-phantom.js @@ -0,0 +1,21 @@ +// Logging setup for phantom integration +// adapted from Modernizr + +QUnit.begin = function() { + console.log("Starting test suite"); + console.log("================================================\n"); +}; + +QUnit.moduleDone = function(opts) { + if(opts.failed === 0) { + console.log("\u2714 All tests passed in '"+opts.name+"' module"); + } else { + console.log("\u2716 "+ opts.failed +" tests failed in '"+opts.name+"' module"); + } +}; + +QUnit.done = function(opts) { + console.log("\n================================================"); + console.log("Tests completed in "+opts.runtime+" milliseconds"); + console.log(opts.passed + " tests of "+opts.total+" passed, "+opts.failed+" failed."); +}; \ No newline at end of file -- cgit v1.2.3 From f84882122ef98500af143ddaaf055262cfbdf0c3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 19 Apr 2012 17:40:58 -0700 Subject: style changes to phantom integration --- js/tests/phantom.js | 102 ++++++++++++++++++------------------- js/tests/unit/bootstrap-phantom.js | 32 ++++++------ 2 files changed, 66 insertions(+), 68 deletions(-) (limited to 'js/tests') diff --git a/js/tests/phantom.js b/js/tests/phantom.js index f172e7cbc..5173ba9a1 100644 --- a/js/tests/phantom.js +++ b/js/tests/phantom.js @@ -1,65 +1,63 @@ -/* - * Simple phantom.js integration script - * Adapted from Modernizr - */ +// Simple phantom.js integration script +// Adapted from Modernizr function waitFor(testFx, onReady, timeOutMillis) { - var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001, //< Default Max Timout is 3s - start = new Date().getTime(), - condition = false, - interval = setInterval(function() { - if ( (new Date().getTime() - start < maxtimeOutMillis) && !condition ) { - // If not time-out yet and condition not yet fulfilled - condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()); //< defensive code - } else { - if(!condition) { - // If condition still not fulfilled (timeout but condition is 'false') - console.log("'waitFor()' timeout"); - phantom.exit(1); - } else { - // Condition fulfilled (timeout and/or condition is 'true') - typeof(onReady) === "string" ? eval(onReady) : onReady(); //< Do what it's supposed to do once the condition is fulfilled - clearInterval(interval); //< Stop this interval - } - } - }, 100); //< repeat check every 250ms -}; + var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001 //< Default Max Timout is 3s + , start = new Date().getTime() + , condition = false + , interval = setInterval(function() { + if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) { + // If not time-out yet and condition not yet fulfilled + condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code + } else { + if(!condition) { + // If condition still not fulfilled (timeout but condition is 'false') + console.log("'waitFor()' timeout") + phantom.exit(1) + } else { + // Condition fulfilled (timeout and/or condition is 'true') + typeof(onReady) === "string" ? eval(onReady) : onReady() //< Do what it's supposed to do once the condition is fulfilled + clearInterval(interval) //< Stop this interval + } + } + }, 100) //< repeat check every 100ms +} if (phantom.args.length === 0 || phantom.args.length > 2) { - console.log('Usage: phantom.js URL'); - phantom.exit(); + console.log('Usage: phantom.js URL') + phantom.exit() } -var page = new WebPage(); +var page = new WebPage() // Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this") page.onConsoleMessage = function(msg) { - console.log(msg); + console.log(msg) }; page.open(phantom.args[0], function(status){ - if (status !== "success") { - console.log("Unable to access network"); - phantom.exit(); - } else { - waitFor(function(){ - return page.evaluate(function(){ - var el = document.getElementById('qunit-testresult'); - if (el && el.innerText.match('completed')) { - return true; - } - return false; - }); - }, function(){ - var failedNum = page.evaluate(function(){ - var el = document.getElementById('qunit-testresult'); - try { - return el.getElementsByClassName('failed')[0].innerHTML; - } catch (e) { } - return 10000; - }); - phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0); - }); - } -}); \ No newline at end of file + if (status !== "success") { + console.log("Unable to access network") + phantom.exit() + } else { + waitFor(function(){ + return page.evaluate(function(){ + var el = document.getElementById('qunit-testresult') + if (el && el.innerText.match('completed')) { + return true + } + return false + }) + }, function(){ + var failedNum = page.evaluate(function(){ + var el = document.getElementById('qunit-testresult') + try { + return el.getElementsByClassName('failed')[0].innerHTML + } catch (e) { } + return 10000 + }); + phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0) + }) + } +}) \ No newline at end of file diff --git a/js/tests/unit/bootstrap-phantom.js b/js/tests/unit/bootstrap-phantom.js index 8bed5f603..a04aeaa87 100644 --- a/js/tests/unit/bootstrap-phantom.js +++ b/js/tests/unit/bootstrap-phantom.js @@ -1,21 +1,21 @@ // Logging setup for phantom integration // adapted from Modernizr -QUnit.begin = function() { - console.log("Starting test suite"); - console.log("================================================\n"); -}; +QUnit.begin = function () { + console.log("Starting test suite") + console.log("================================================\n") +} -QUnit.moduleDone = function(opts) { - if(opts.failed === 0) { - console.log("\u2714 All tests passed in '"+opts.name+"' module"); - } else { - console.log("\u2716 "+ opts.failed +" tests failed in '"+opts.name+"' module"); - } -}; +QUnit.moduleDone = function (opts) { + if (opts.failed === 0) { + console.log("\u2714 All tests passed in '" + opts.name + "' module") + } else { + console.log("\u2716 " + opts.failed + " tests failed in '" + opts.name + "' module") + } +} -QUnit.done = function(opts) { - console.log("\n================================================"); - console.log("Tests completed in "+opts.runtime+" milliseconds"); - console.log(opts.passed + " tests of "+opts.total+" passed, "+opts.failed+" failed."); -}; \ No newline at end of file +QUnit.done = function (opts) { + console.log("\n================================================") + console.log("Tests completed in " + opts.runtime + " milliseconds") + console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.") +} \ No newline at end of file -- cgit v1.2.3 From c896a182e13b0e5d12a5c2104119d7b873b22162 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Apr 2012 03:18:13 -0700 Subject: increase length of waitfor timeout for phantom --- js/tests/phantom.js | 6 +++--- js/tests/pid.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 js/tests/pid.txt (limited to 'js/tests') diff --git a/js/tests/phantom.js b/js/tests/phantom.js index 5173ba9a1..4105bf529 100644 --- a/js/tests/phantom.js +++ b/js/tests/phantom.js @@ -2,15 +2,15 @@ // Adapted from Modernizr function waitFor(testFx, onReady, timeOutMillis) { - var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 3001 //< Default Max Timout is 3s + var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 5001 //< Default Max Timout is 5s , start = new Date().getTime() , condition = false - , interval = setInterval(function() { + , interval = setInterval(function () { if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) { // If not time-out yet and condition not yet fulfilled condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code } else { - if(!condition) { + if (!condition) { // If condition still not fulfilled (timeout but condition is 'false') console.log("'waitFor()' timeout") phantom.exit(1) diff --git a/js/tests/pid.txt b/js/tests/pid.txt new file mode 100644 index 000000000..129f3d621 --- /dev/null +++ b/js/tests/pid.txt @@ -0,0 +1 @@ +1520 \ No newline at end of file -- cgit v1.2.3 From c408d8961b96f12c40aaf1d7647578cd3535bd64 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Apr 2012 03:44:32 -0700 Subject: rewrite server.js, fix travis --- js/tests/pid.txt | 1 - js/tests/server.js | 16 ++++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 js/tests/pid.txt (limited to 'js/tests') diff --git a/js/tests/pid.txt b/js/tests/pid.txt deleted file mode 100644 index 129f3d621..000000000 --- a/js/tests/pid.txt +++ /dev/null @@ -1 +0,0 @@ -1520 \ No newline at end of file diff --git a/js/tests/server.js b/js/tests/server.js index 27d1bf24b..7c8445feb 100644 --- a/js/tests/server.js +++ b/js/tests/server.js @@ -4,15 +4,11 @@ */ var connect = require('connect') - , args = process.argv.slice(2) - , fs = require('fs') - , folder = '/../../' - , port = '3000' + , http = require('http') + , fs = require('fs') + , app = connect() + .use(connect.static(__dirname + '/../../')); -var server = connect.createServer( - connect.static(__dirname + folder) -).listen(port) +http.createServer(app).listen(3000); -fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8') - -console.log("Server started on port %s in %s", port, folder) \ No newline at end of file +fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8') \ No newline at end of file -- cgit v1.2.3