From 6d624a89bd5b43e67106ca48b18aa89c5efde390 Mon Sep 17 00:00:00 2001 From: David Majda Date: Mon, 16 Apr 2012 14:54:34 +0200 Subject: [PATCH] Update bundled QUnit to version 1.5.0 --- test/run | 22 +- test/vendor/qunit/qunit.css | 13 +- test/vendor/qunit/qunit.js | 648 +++++++++++++++++++++--------------- 3 files changed, 405 insertions(+), 278 deletions(-) diff --git a/test/run b/test/run index 98192a8..dd2e444 100755 --- a/test/run +++ b/test/run @@ -3,7 +3,7 @@ var util = require("util"); var fs = require("fs"); var PEG = require("../lib/peg"); -var QUnit = require("./vendor/qunit/qunit").QUnit; +var QUnit = require("./vendor/qunit/qunit"); function bold(s) { return "\u001B[1m" + s + "\u001B[22m"; }; function message(s) { return "\u001B[35m" + s + "\u001B[39m"; }; @@ -18,18 +18,18 @@ QUnit.init(); QUnit.config.blocking = true; QUnit.config.updateRate = 0; -QUnit.moduleStart = function(details) { +QUnit.moduleStart(function(details) { util.puts(""); util.puts(bold(details.name)); -}; +}); var failedAssertions = []; -QUnit.testStart = function(details) { +QUnit.testStart(function(details) { failedAssertions = []; -}; +}); -QUnit.testDone = function(details) { +QUnit.testDone(function(details) { if (details.failed == 0) { util.puts('✔ ' + details.name); } else { @@ -39,9 +39,9 @@ QUnit.testDone = function(details) { util.puts(assertion); }); } -}; +}); -QUnit.log = function(details) { +QUnit.log(function(details) { if (details.result) { return; } var output = "" @@ -56,9 +56,9 @@ QUnit.log = function(details) { } failedAssertions.push(output); -}; +}); -QUnit.done = function(details) { +QUnit.done(function(details) { util.puts(""); if (details.failed > 0) { util.puts(bold(error("FAILURES: ")) @@ -72,7 +72,7 @@ QUnit.done = function(details) { + details.runtime + " ms)" ) } -}; +}); [ "helpers.js", diff --git a/test/vendor/qunit/qunit.css b/test/vendor/qunit/qunit.css index c85f36a..b948bae 100644 --- a/test/vendor/qunit/qunit.css +++ b/test/vendor/qunit/qunit.css @@ -1,9 +1,9 @@ /** - * QUnit - A JavaScript Unit Testing Framework + * QUnit v1.5.0 - A JavaScript Unit Testing Framework * * http://docs.jquery.com/QUnit * - * Copyright (c) 2011 John Resig, Jörn Zaefferer + * Copyright (c) 2012 John Resig, Jörn Zaefferer * Dual licensed under the MIT (MIT-LICENSE.txt) * or GPL (GPL-LICENSE.txt) licenses. */ @@ -54,6 +54,10 @@ color: #fff; } +#qunit-header label { + display: inline-block; +} + #qunit-banner { height: 5px; } @@ -216,6 +220,9 @@ border-bottom: 1px solid white; } +#qunit-testresult .module-name { + font-weight: bold; +} /** Fixture */ @@ -223,4 +230,6 @@ position: absolute; top: -10000px; left: -10000px; + width: 1000px; + height: 1000px; } diff --git a/test/vendor/qunit/qunit.js b/test/vendor/qunit/qunit.js index 09eb1a5..66dd721 100644 --- a/test/vendor/qunit/qunit.js +++ b/test/vendor/qunit/qunit.js @@ -1,9 +1,9 @@ /** - * QUnit - A JavaScript Unit Testing Framework + * QUnit v1.5.0 - A JavaScript Unit Testing Framework * * http://docs.jquery.com/QUnit * - * Copyright (c) 2011 John Resig, Jörn Zaefferer + * Copyright (c) 2012 John Resig, Jörn Zaefferer * Dual licensed under the MIT (MIT-LICENSE.txt) * or GPL (GPL-LICENSE.txt) licenses. */ @@ -13,21 +13,25 @@ var defined = { setTimeout: typeof window.setTimeout !== "undefined", sessionStorage: (function() { + var x = "qunit-test-string"; try { - return !!sessionStorage.getItem; + sessionStorage.setItem(x, x); + sessionStorage.removeItem(x); + return true; } catch(e) { return false; } - })() + }()) }; -var testId = 0; +var testId = 0, + toString = Object.prototype.toString, + hasOwn = Object.prototype.hasOwnProperty; -var Test = function(name, testName, expected, testEnvironmentArg, async, callback) { +var Test = function(name, testName, expected, async, callback) { this.name = name; this.testName = testName; this.expected = expected; - this.testEnvironmentArg = testEnvironmentArg; this.async = async; this.callback = callback; this.assertions = []; @@ -60,6 +64,10 @@ Test.prototype = { runLoggingCallbacks( 'moduleStart', QUnit, { name: this.module } ); + } else if (config.autorun) { + runLoggingCallbacks( 'moduleStart', QUnit, { + name: this.module + } ); } config.current = this; @@ -67,29 +75,38 @@ Test.prototype = { setup: function() {}, teardown: function() {} }, this.moduleTestEnvironment); - if (this.testEnvironmentArg) { - extend(this.testEnvironment, this.testEnvironmentArg); - } runLoggingCallbacks( 'testStart', QUnit, { - name: this.testName - } ); + name: this.testName, + module: this.module + }); // allow utility functions to access the current test environment // TODO why?? QUnit.current_testEnvironment = this.testEnvironment; + if ( !config.pollution ) { + saveGlobal(); + } + if ( config.notrycatch ) { + this.testEnvironment.setup.call(this.testEnvironment); + return; + } try { - if ( !config.pollution ) { - saveGlobal(); - } - this.testEnvironment.setup.call(this.testEnvironment); } catch(e) { - QUnit.ok( false, "Setup failed on " + this.testName + ": " + e.message ); + QUnit.pushFailure( "Setup failed on " + this.testName + ": " + e.message, extractStacktrace( e, 1 ) ); } }, run: function() { + config.current = this; + + var running = id("qunit-testresult"); + + if ( running ) { + running.innerHTML = "Running:
" + this.name; + } + if ( this.async ) { QUnit.stop(); } @@ -101,31 +118,40 @@ Test.prototype = { try { this.callback.call(this.testEnvironment); } catch(e) { - fail("Test " + this.testName + " died, exception and test follows", e, this.callback); - QUnit.ok( false, "Died on test #" + (this.assertions.length + 1) + ": " + e.message + " - " + QUnit.jsDump.parse(e) ); + QUnit.pushFailure( "Died on test #" + (this.assertions.length + 1) + ": " + e.message, extractStacktrace( e, 1 ) ); // else next test will carry the responsibility saveGlobal(); // Restart the tests if they're blocking if ( config.blocking ) { - start(); + QUnit.start(); } } }, teardown: function() { - try { + config.current = this; + if ( config.notrycatch ) { this.testEnvironment.teardown.call(this.testEnvironment); - checkPollution(); - } catch(e) { - QUnit.ok( false, "Teardown failed on " + this.testName + ": " + e.message ); + return; + } else { + try { + this.testEnvironment.teardown.call(this.testEnvironment); + } catch(e) { + QUnit.pushFailure( "Teardown failed on " + this.testName + ": " + e.message, extractStacktrace( e, 1 ) ); + } } + checkPollution(); }, finish: function() { - if ( this.expected && this.expected != this.assertions.length ) { - QUnit.ok( false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" ); + config.current = this; + if ( this.expected != null && this.expected != this.assertions.length ) { + QUnit.pushFailure( "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" ); + } else if ( this.expected == null && !this.assertions.length ) { + QUnit.pushFailure( "Expected at least one assertion, but none were run - call expect(0) to accept zero assertions." ); } var good = 0, bad = 0, + li, i, tests = id("qunit-tests"); config.stats.all += this.assertions.length; @@ -134,10 +160,10 @@ Test.prototype = { if ( tests ) { var ol = document.createElement("ol"); - for ( var i = 0; i < this.assertions.length; i++ ) { + for ( i = 0; i < this.assertions.length; i++ ) { var assertion = this.assertions[i]; - var li = document.createElement("li"); + li = document.createElement("li"); li.className = assertion.result ? "pass" : "fail"; li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed"); ol.appendChild( li ); @@ -154,13 +180,13 @@ Test.prototype = { // store result when possible if ( QUnit.config.reorder && defined.sessionStorage ) { if (bad) { - sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad); + sessionStorage.setItem("qunit-test-" + this.module + "-" + this.testName, bad); } else { - sessionStorage.removeItem("qunit-" + this.module + "-" + this.testName); + sessionStorage.removeItem("qunit-test-" + this.module + "-" + this.testName); } } - if (bad == 0) { + if (bad === 0) { ol.style.display = "none"; } @@ -187,7 +213,7 @@ Test.prototype = { } }); - var li = id(this.id); + li = id(this.id); li.className = bad ? "fail" : "pass"; li.removeChild( li.firstChild ); li.appendChild( b ); @@ -195,7 +221,7 @@ Test.prototype = { li.appendChild( ol ); } else { - for ( var i = 0; i < this.assertions.length; i++ ) { + for ( i = 0; i < this.assertions.length; i++ ) { if ( !this.assertions[i].result ) { bad++; config.stats.bad++; @@ -204,14 +230,11 @@ Test.prototype = { } } - try { - QUnit.reset(); - } catch(e) { - fail("reset() failed, following Test " + this.testName + ", exception and reset fn follows", e, QUnit.reset); - } + QUnit.reset(); runLoggingCallbacks( 'testDone', QUnit, { name: this.testName, + module: this.module, failed: bad, passed: this.assertions.length - bad, total: this.assertions.length @@ -239,12 +262,12 @@ Test.prototype = { }); } // defer when previous test run passed, if storage is available - var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-" + this.module + "-" + this.testName); + var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-test-" + this.module + "-" + this.testName); if (bad) { run(); } else { - synchronize(run); - }; + synchronize(run, true); + } } }; @@ -260,24 +283,19 @@ var QUnit = { asyncTest: function(testName, expected, callback) { if ( arguments.length === 2 ) { callback = expected; - expected = 0; + expected = null; } QUnit.test(testName, expected, callback, true); }, test: function(testName, expected, callback, async) { - var name = '' + testName + '', testEnvironmentArg; + var name = '' + escapeInnerText(testName) + ''; if ( arguments.length === 2 ) { callback = expected; expected = null; } - // is 2nd argument a testEnvironment? - if ( expected && typeof expected === 'object') { - testEnvironmentArg = expected; - expected = null; - } if ( config.currentModule ) { name = '' + config.currentModule + ": " + name; @@ -287,49 +305,45 @@ var QUnit = { return; } - var test = new Test(name, testName, expected, testEnvironmentArg, async, callback); + var test = new Test(name, testName, expected, async, callback); test.module = config.currentModule; test.moduleTestEnvironment = config.currentModuleTestEnviroment; test.queue(); }, - /** - * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through. - */ + // Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through. expect: function(asserts) { config.current.expected = asserts; }, - /** - * Asserts true. - * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" ); - */ - ok: function(a, msg) { - a = !!a; + // Asserts true. + // @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" ); + ok: function(result, msg) { + if (!config.current) { + throw new Error("ok() assertion outside test context, was " + sourceFromStacktrace(2)); + } + result = !!result; var details = { - result: a, + result: result, message: msg }; - msg = escapeHtml(msg); + msg = escapeInnerText(msg || (result ? "okay" : "failed")); + if ( !result ) { + var source = sourceFromStacktrace(2); + if (source) { + details.source = source; + msg += '
Source: 
' + escapeInnerText(source) + '
'; + } + } runLoggingCallbacks( 'log', QUnit, details ); config.current.assertions.push({ - result: a, + result: result, message: msg }); }, - /** - * Checks that the first two arguments are equal, with an optional message. - * Prints out both actual and expected values. - * - * Prefered to ok( actual == expected, message ) - * - * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." ); - * - * @param Object actual - * @param Object expected - * @param String message (optional) - */ + // Checks that the first two arguments are equal, with an optional message. Prints out both actual and expected values. + // @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." ); equal: function(actual, expected, message) { QUnit.push(expected == actual, actual, expected, message); }, @@ -363,7 +377,7 @@ var QUnit = { } try { - block(); + block.call(config.current.testEnvironment); } catch (e) { actual = e; } @@ -387,8 +401,8 @@ var QUnit = { QUnit.ok(ok, message); }, - start: function() { - config.semaphore--; + start: function(count) { + config.semaphore -= count || 1; if (config.semaphore > 0) { // don't start until equal number of stop-calls return; @@ -408,40 +422,46 @@ var QUnit = { } config.blocking = false; - process(); + process(true); }, 13); } else { config.blocking = false; - process(); + process(true); } }, - stop: function(timeout) { - config.semaphore++; + stop: function(count) { + config.semaphore += count || 1; config.blocking = true; - if ( timeout && defined.setTimeout ) { + if ( config.testTimeout && defined.setTimeout ) { clearTimeout(config.timeout); config.timeout = window.setTimeout(function() { QUnit.ok( false, "Test timed out" ); + config.semaphore = 1; QUnit.start(); - }, timeout); + }, config.testTimeout); } } }; //We want access to the constructor's prototype (function() { - function F(){}; + function F(){} F.prototype = QUnit; QUnit = new F(); //Make F QUnit's constructor so that we can add to the prototype later QUnit.constructor = F; -})(); +}()); -// Backwards compatibility, deprecated -QUnit.equals = QUnit.equal; -QUnit.same = QUnit.deepEqual; +// deprecated; still export them to window to provide clear error messages +// next step: remove entirely +QUnit.equals = function() { + QUnit.push(false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead"); +}; +QUnit.same = function() { + QUnit.push(false, false, false, "QUnit.same has been deprecated since 2009 (e88049a0), use QUnit.deepEqual instead"); +}; // Maintain internal state var config = { @@ -496,17 +516,14 @@ var config = { config.filter = urlParams.filter; // Figure out if we're running the tests from a server or not - QUnit.isLocal = !!(location.protocol === 'file:'); -})(); + QUnit.isLocal = location.protocol === 'file:'; +}()); // Expose the API as global variables, unless an 'exports' -// object exists, in that case we assume we're in CommonJS +// object exists, in that case we assume we're in CommonJS - export everything at the end if ( typeof exports === "undefined" || typeof require === "undefined" ) { extend(window, QUnit); window.QUnit = QUnit; -} else { - extend(exports, QUnit); - exports.QUnit = QUnit; } // define these after exposing globals to keep them in these QUnit namespace only @@ -518,7 +535,7 @@ extend(QUnit, { extend(config, { stats: { all: 0, bad: 0 }, moduleStats: { all: 0, bad: 0 }, - started: +new Date, + started: +new Date(), updateRate: 1000, blocking: false, autostart: true, @@ -528,6 +545,16 @@ extend(QUnit, { semaphore: 0 }); + var qunit = id( "qunit" ); + if ( qunit ) { + qunit.innerHTML = + '

' + escapeInnerText( document.title ) + '

' + + '

' + + '
' + + '

' + + '
    '; + } + var tests = id( "qunit-tests" ), banner = id( "qunit-banner" ), result = id( "qunit-testresult" ); @@ -553,11 +580,8 @@ extend(QUnit, { } }, - /** - * Resets the test setup. Useful for tests that modify the DOM. - * - * If jQuery is available, uses jQuery's html(), otherwise just innerHTML. - */ + // Resets the test setup. Useful for tests that modify the DOM. + // If jQuery is available, uses jQuery's html(), otherwise just innerHTML. reset: function() { if ( window.jQuery ) { jQuery( "#qunit-fixture" ).html( config.fixture ); @@ -569,14 +593,8 @@ extend(QUnit, { } }, - /** - * Trigger an event on an element. - * - * @example triggerEvent( document.body, "click" ); - * - * @param DOMElement elem - * @param String type - */ + // Trigger an event on an element. + // @example triggerEvent( document.body, "click" ); triggerEvent: function( elem, type, event ) { if ( document.createEvent ) { event = document.createEvent("MouseEvents"); @@ -604,23 +622,21 @@ extend(QUnit, { return "null"; } - var type = Object.prototype.toString.call( obj ) - .match(/^\[object\s(.*)\]$/)[1] || ''; + var type = toString.call( obj ).match(/^\[object\s(.*)\]$/)[1] || ''; switch (type) { - case 'Number': - if (isNaN(obj)) { - return "nan"; - } else { - return "number"; - } - case 'String': - case 'Boolean': - case 'Array': - case 'Date': - case 'RegExp': - case 'Function': - return type.toLowerCase(); + case 'Number': + if (isNaN(obj)) { + return "nan"; + } + return "number"; + case 'String': + case 'Boolean': + case 'Array': + case 'Date': + case 'RegExp': + case 'Function': + return type.toLowerCase(); } if (typeof obj === "object") { return "object"; @@ -629,6 +645,9 @@ extend(QUnit, { }, push: function(result, actual, expected, message) { + if (!config.current) { + throw new Error("assertion outside test context, was " + sourceFromStacktrace()); + } var details = { result: result, message: message, @@ -636,23 +655,24 @@ extend(QUnit, { expected: expected }; - message = escapeHtml(message) || (result ? "okay" : "failed"); + message = escapeInnerText(message) || (result ? "okay" : "failed"); message = '' + message + ""; - expected = escapeHtml(QUnit.jsDump.parse(expected)); - actual = escapeHtml(QUnit.jsDump.parse(actual)); - var output = message + ''; - if (actual != expected) { - output += ''; - output += ''; - } + var output = message; if (!result) { + expected = escapeInnerText(QUnit.jsDump.parse(expected)); + actual = escapeInnerText(QUnit.jsDump.parse(actual)); + output += '
    Expected: 
    ' + expected + '
    Result: 
    ' + actual + '
    Diff: 
    ' + QUnit.diff(expected, actual) +'
    '; + if (actual != expected) { + output += ''; + output += ''; + } var source = sourceFromStacktrace(); if (source) { details.source = source; - output += ''; + output += ''; } + output += "
    Expected: 
    ' + expected + '
    Result: 
    ' + actual + '
    Diff: 
    ' + QUnit.diff(expected, actual) +'
    Source: 
    ' + escapeHtml(source) + '
    Source: 
    ' + escapeInnerText(source) + '
    "; } - output += ""; runLoggingCallbacks( 'log', QUnit, details ); @@ -662,11 +682,31 @@ extend(QUnit, { }); }, + pushFailure: function(message, source) { + var details = { + result: false, + message: message + }; + var output = escapeInnerText(message); + if (source) { + details.source = source; + output += '
    Source: 
    ' + escapeInnerText(source) + '
    '; + } + runLoggingCallbacks( 'log', QUnit, details ); + config.current.assertions.push({ + result: false, + message: output + }); + }, + url: function( params ) { params = extend( extend( {}, QUnit.urlParams ), params ); var querystring = "?", key; for ( key in params ) { + if ( !hasOwn.call( params, key ) ) { + continue; + } querystring += encodeURIComponent( key ) + "=" + encodeURIComponent( params[ key ] ) + "&"; } @@ -675,7 +715,7 @@ extend(QUnit, { extend: extend, id: id, - addEvent: addEvent, + addEvent: addEvent }); //QUnit.constructor is set to the empty F() above so that we can add to it's prototype later @@ -696,7 +736,7 @@ extend(QUnit.constructor.prototype, { // moduleStart: { name } moduleStart: registerLoggingCallback('moduleStart'), // moduleDone: { name, failed, passed, total } - moduleDone: registerLoggingCallback('moduleDone'), + moduleDone: registerLoggingCallback('moduleDone') }); if ( typeof document === "undefined" || document.readyState === "complete" ) { @@ -714,7 +754,8 @@ QUnit.load = function() { config.blocking = false; var urlConfigHtml = '', len = config.urlConfig.length; - for ( var i = 0, val; i < len, val = config.urlConfig[i]; i++ ) { + for ( var i = 0, val; i < len; i++ ) { + val = config.urlConfig[i]; config[val] = QUnit.urlParams[val]; urlConfigHtml += ''; } @@ -779,6 +820,17 @@ QUnit.load = function() { addEvent(window, "load", QUnit.load); +// addEvent(window, "error") gives us a useless event object +window.onerror = function( message, file, line ) { + if ( QUnit.config.current ) { + QUnit.pushFailure( message, file + ":" + line ); + } else { + QUnit.test( "global failure", function() { + QUnit.pushFailure( message, file + ":" + line ); + }); + } +}; + function done() { config.autorun = true; @@ -794,7 +846,7 @@ function done() { var banner = id("qunit-banner"), tests = id("qunit-tests"), - runtime = +new Date - config.started, + runtime = +new Date() - config.started, passed = config.stats.all - config.stats.bad, html = [ 'Tests completed in ', @@ -826,6 +878,17 @@ function done() { ].join(" "); } + // clear own sessionStorage items if all tests passed + if ( config.reorder && defined.sessionStorage && config.stats.bad === 0 ) { + var key; + for ( var i = 0; i < sessionStorage.length; i++ ) { + key = sessionStorage.key( i++ ); + if ( key.indexOf("qunit-test-") === 0 ) { + sessionStorage.removeItem( key ); + } + } + } + runLoggingCallbacks( 'done', QUnit, { failed: config.stats.bad, passed: passed, @@ -858,36 +921,48 @@ function validTest( name ) { return run; } -// so far supports only Firefox, Chrome and Opera (buggy) -// could be extended in the future to use something like https://github.com/csnover/TraceKit -function sourceFromStacktrace() { +// so far supports only Firefox, Chrome and Opera (buggy), Safari (for real exceptions) +// Later Safari and IE10 are supposed to support error.stack as well +// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack +function extractStacktrace( e, offset ) { + offset = offset || 3; + if (e.stacktrace) { + // Opera + return e.stacktrace.split("\n")[offset + 3]; + } else if (e.stack) { + // Firefox, Chrome + var stack = e.stack.split("\n"); + if (/^error$/i.test(stack[0])) { + stack.shift(); + } + return stack[offset]; + } else if (e.sourceURL) { + // Safari, PhantomJS + // hopefully one day Safari provides actual stacktraces + // exclude useless self-reference for generated Error objects + if ( /qunit.js$/.test( e.sourceURL ) ) { + return; + } + // for actual exceptions, this is useful + return e.sourceURL + ":" + e.line; + } +} +function sourceFromStacktrace(offset) { try { throw new Error(); } catch ( e ) { - if (e.stacktrace) { - // Opera - return e.stacktrace.split("\n")[6]; - } else if (e.stack) { - // Firefox, Chrome - return e.stack.split("\n")[4]; - } else if (e.sourceURL) { - // Safari, PhantomJS - // TODO sourceURL points at the 'throw new Error' line above, useless - //return e.sourceURL + ":" + e.line; - } + return extractStacktrace( e, offset ); } } -function escapeHtml(s) { +function escapeInnerText(s) { if (!s) { return ""; } s = s + ""; - return s.replace(/[\&"<>\\]/g, function(s) { + return s.replace(/[\&<>]/g, function(s) { switch(s) { case "&": return "&"; - case "\\": return "\\\\"; - case '"': return '\"'; case "<": return "<"; case ">": return ">"; default: return s; @@ -895,26 +970,31 @@ function escapeHtml(s) { }); } -function synchronize( callback ) { +function synchronize( callback, last ) { config.queue.push( callback ); if ( config.autorun && !config.blocking ) { - process(); + process(last); } } -function process() { - var start = (new Date()).getTime(); +function process( last ) { + function next() { + process( last ); + } + var start = new Date().getTime(); + config.depth = config.depth ? config.depth + 1 : 1; while ( config.queue.length && !config.blocking ) { - if ( config.updateRate <= 0 || (((new Date()).getTime() - start) < config.updateRate) ) { + if ( !defined.setTimeout || config.updateRate <= 0 || ( ( new Date().getTime() - start ) < config.updateRate ) ) { config.queue.shift()(); } else { - window.setTimeout( process, 13 ); + window.setTimeout( next, 13 ); break; } } - if (!config.blocking && !config.queue.length) { + config.depth--; + if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) { done(); } } @@ -924,6 +1004,9 @@ function saveGlobal() { if ( config.noglobals ) { for ( var key in window ) { + if ( !hasOwn.call( window, key ) ) { + continue; + } config.pollution.push( key ); } } @@ -935,12 +1018,12 @@ function checkPollution( name ) { var newGlobals = diff( config.pollution, old ); if ( newGlobals.length > 0 ) { - ok( false, "Introduced global variable(s): " + newGlobals.join(", ") ); + QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join(", ") ); } var deletedGlobals = diff( old, config.pollution ); if ( deletedGlobals.length > 0 ) { - ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") ); + QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join(", ") ); } } @@ -959,22 +1042,13 @@ function diff( a, b ) { return result; } -function fail(message, exception, callback) { - if ( typeof console !== "undefined" && console.error && console.warn ) { - console.error(message); - console.error(exception); - console.warn(callback.toString()); - - } else if ( window.opera && opera.postError ) { - opera.postError(message, exception, callback.toString); - } -} - function extend(a, b) { for ( var prop in b ) { if ( b[prop] === undefined ) { delete a[prop]; - } else { + + // Avoid "Member not found" error in IE8 caused by setting window.constructor + } else if ( prop !== "constructor" || a !== window ) { a[prop] = b[prop]; } } @@ -1019,7 +1093,7 @@ function runLoggingCallbacks(key, scope, args) { // Test for equality any JavaScript type. // Author: Philippe Rathé -QUnit.equiv = function () { +QUnit.equiv = (function() { var innerEquiv; // the real equiv function var callers = []; // stack to decide between skip/abort functions @@ -1037,7 +1111,11 @@ QUnit.equiv = function () { } } - var callbacks = function () { + var getProto = Object.getPrototypeOf || function (obj) { + return obj.__proto__; + }; + + var callbacks = (function () { // for string, boolean, number and null function useStrictEquality(b, a) { @@ -1064,17 +1142,18 @@ QUnit.equiv = function () { }, "date" : function(b, a) { - return QUnit.objectType(b) === "date" - && a.valueOf() === b.valueOf(); + return QUnit.objectType(b) === "date" && a.valueOf() === b.valueOf(); }, "regexp" : function(b, a) { - return QUnit.objectType(b) === "regexp" - && a.source === b.source && // the regex itself - a.global === b.global && // and its modifers - // (gmi) ... - a.ignoreCase === b.ignoreCase - && a.multiline === b.multiline; + return QUnit.objectType(b) === "regexp" && + // the regex itself + a.source === b.source && + // and its modifers + a.global === b.global && + // (gmi) ... + a.ignoreCase === b.ignoreCase && + a.multiline === b.multiline; }, // - skip when the property is a method of an instance (OOP) @@ -1090,7 +1169,7 @@ QUnit.equiv = function () { var len; // b could be an object literal here - if (!(QUnit.objectType(b) === "array")) { + if (QUnit.objectType(b) !== "array") { return false; } @@ -1126,7 +1205,13 @@ QUnit.equiv = function () { // comparing constructors is more strict than using // instanceof if (a.constructor !== b.constructor) { - return false; + // Allow objects with no prototype to be equivalent to + // objects with Object as their constructor. + if (!((getProto(a) === null && getProto(b) === Object.prototype) || + (getProto(b) === null && getProto(a) === Object.prototype))) + { + return false; + } } // stack constructor before traversing properties @@ -1138,9 +1223,10 @@ QUnit.equiv = function () { // and go deep loop = false; for (j = 0; j < parents.length; j++) { - if (parents[j] === a[i]) - loop = true; // don't go down the same path - // twice + if (parents[j] === a[i]) { + // don't go down the same path twice + loop = true; + } } aProperties.push(i); // collect a's properties @@ -1158,12 +1244,10 @@ QUnit.equiv = function () { } // Ensures identical properties name - return eq - && innerEquiv(aProperties.sort(), bProperties - .sort()); + return eq && innerEquiv(aProperties.sort(), bProperties.sort()); } }; - }(); + }()); innerEquiv = function() { // can take multiple arguments var args = Array.prototype.slice.apply(arguments); @@ -1174,23 +1258,21 @@ QUnit.equiv = function () { return (function(a, b) { if (a === b) { return true; // catch the most you can - } else if (a === null || b === null || typeof a === "undefined" - || typeof b === "undefined" - || QUnit.objectType(a) !== QUnit.objectType(b)) { + } else if (a === null || b === null || typeof a === "undefined" || + typeof b === "undefined" || + QUnit.objectType(a) !== QUnit.objectType(b)) { return false; // don't lose time with error prone cases } else { return bindCallbacks(a, callbacks, [ b, a ]); } // apply transition with (1..n) arguments - })(args[0], args[1]) - && arguments.callee.apply(this, args.splice(1, - args.length - 1)); + }(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length - 1))); }; return innerEquiv; -}(); +}()); /** * jsDump Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | @@ -1205,33 +1287,36 @@ QUnit.equiv = function () { QUnit.jsDump = (function() { function quote( str ) { return '"' + str.toString().replace(/"/g, '\\"') + '"'; - }; + } function literal( o ) { return o + ''; - }; + } function join( pre, arr, post ) { var s = jsDump.separator(), base = jsDump.indent(), inner = jsDump.indent(1); - if ( arr.join ) + if ( arr.join ) { arr = arr.join( ',' + s + inner ); - if ( !arr ) + } + if ( !arr ) { return pre + post; + } return [ pre, inner + arr, base + post ].join(s); - }; + } function array( arr, stack ) { - var i = arr.length, ret = Array(i); + var i = arr.length, ret = new Array(i); this.up(); - while ( i-- ) + while ( i-- ) { ret[i] = this.parse( arr[i] , undefined , stack); + } this.down(); return join( '[', ret, ']' ); - }; + } var reName = /^function (\w+)/; var jsDump = { - parse:function( obj, type, stack ) { //type is used mostly internally, you can fix a (custom)type in advance + parse: function( obj, type, stack ) { //type is used mostly internally, you can fix a (custom)type in advance stack = stack || [ ]; var parser = this.parsers[ type || this.typeOf(obj) ]; type = typeof parser; @@ -1249,7 +1334,7 @@ QUnit.jsDump = (function() { // else return (type == 'string') ? parser : this.parsers.error; }, - typeOf:function( obj ) { + typeOf: function( obj ) { var type; if ( obj === null ) { type = "null"; @@ -1267,52 +1352,60 @@ QUnit.jsDump = (function() { type = "document"; } else if (obj.nodeType) { type = "node"; - } else if (typeof obj === "object" && typeof obj.length === "number" && obj.length >= 0) { + } else if ( + // native arrays + toString.call( obj ) === "[object Array]" || + // NodeList objects + ( typeof obj.length === "number" && typeof obj.item !== "undefined" && ( obj.length ? obj.item(0) === obj[0] : ( obj.item( 0 ) === null && typeof obj[0] === "undefined" ) ) ) + ) { type = "array"; } else { type = typeof obj; } return type; }, - separator:function() { + separator: function() { return this.multiline ? this.HTML ? '
    ' : '\n' : this.HTML ? ' ' : ' '; }, - indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing - if ( !this.multiline ) + indent: function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing + if ( !this.multiline ) { return ''; + } var chr = this.indentChar; - if ( this.HTML ) + if ( this.HTML ) { chr = chr.replace(/\t/g,' ').replace(/ /g,' '); - return Array( this._depth_ + (extra||0) ).join(chr); + } + return new Array( this._depth_ + (extra||0) ).join(chr); }, - up:function( a ) { + up: function( a ) { this._depth_ += a || 1; }, - down:function( a ) { + down: function( a ) { this._depth_ -= a || 1; }, - setParser:function( name, parser ) { + setParser: function( name, parser ) { this.parsers[name] = parser; }, // The next 3 are exposed so you can use them - quote:quote, - literal:literal, - join:join, + quote: quote, + literal: literal, + join: join, // _depth_: 1, // This is the list of parsers, to modify them, use jsDump.setParser - parsers:{ + parsers: { window: '[Window]', document: '[Document]', - error:'[ERROR]', //when no parser is found, shouldn't happen + error: '[ERROR]', //when no parser is found, shouldn't happen unknown: '[Unknown]', - 'null':'null', - 'undefined':'undefined', - 'function':function( fn ) { + 'null': 'null', + 'undefined': 'undefined', + 'function': function( fn ) { var ret = 'function', name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE - if ( name ) + if ( name ) { ret += ' ' + name; + } ret += '('; ret = [ ret, QUnit.jsDump.parse( fn, 'functionArgs' ), '){'].join(''); @@ -1320,18 +1413,26 @@ QUnit.jsDump = (function() { }, array: array, nodelist: array, - arguments: array, - object:function( map, stack ) { - var ret = [ ]; + 'arguments': array, + object: function( map, stack ) { + var ret = [ ], keys, key, val, i; QUnit.jsDump.up(); - for ( var key in map ) { - var val = map[key]; - ret.push( QUnit.jsDump.parse(key,'key') + ': ' + QUnit.jsDump.parse(val, undefined, stack)); - } + if (Object.keys) { + keys = Object.keys( map ); + } else { + keys = []; + for (key in map) { keys.push( key ); } + } + keys.sort(); + for (i = 0; i < keys.length; i++) { + key = keys[ i ]; + val = map[ key ]; + ret.push( QUnit.jsDump.parse( key, 'key' ) + ': ' + QUnit.jsDump.parse( val, undefined, stack ) ); + } QUnit.jsDump.down(); return join( '{', ret, '}' ); }, - node:function( node ) { + node: function( node ) { var open = QUnit.jsDump.HTML ? '<' : '<', close = QUnit.jsDump.HTML ? '>' : '>'; @@ -1340,28 +1441,32 @@ QUnit.jsDump = (function() { for ( var a in QUnit.jsDump.DOMAttrs ) { var val = node[QUnit.jsDump.DOMAttrs[a]]; - if ( val ) + if ( val ) { ret += ' ' + a + '=' + QUnit.jsDump.parse( val, 'attribute' ); + } } return ret + close + open + '/' + tag + close; }, - functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function + functionArgs: function( fn ) {//function calls it internally, it's the arguments part of the function var l = fn.length; - if ( !l ) return ''; + if ( !l ) { + return ''; + } - var args = Array(l); - while ( l-- ) + var args = new Array(l); + while ( l-- ) { args[l] = String.fromCharCode(97+l);//97 is 'a' + } return ' ' + args.join(', ') + ' '; }, - key:quote, //object calls it internally, the key part of an item in a map - functionCode:'[code]', //function calls it internally, it's the content of the function - attribute:quote, //node calls it internally, it's an html attribute value - string:quote, - date:quote, - regexp:literal, //regex - number:literal, - 'boolean':literal + key: quote, //object calls it internally, the key part of an item in a map + functionCode: '[code]', //function calls it internally, it's the content of the function + attribute: quote, //node calls it internally, it's an html attribute value + string: quote, + date: quote, + regexp: literal, //regex + number: literal, + 'boolean': literal }, DOMAttrs:{//attributes to dump from nodes, name=>realName id:'id', @@ -1374,7 +1479,7 @@ QUnit.jsDump = (function() { }; return jsDump; -})(); +}()); // from Sizzle.js function getText( elems ) { @@ -1394,7 +1499,7 @@ function getText( elems ) { } return ret; -}; +} //from jquery.js function inArray( elem, array ) { @@ -1429,26 +1534,32 @@ QUnit.diff = (function() { function diff(o, n) { var ns = {}; var os = {}; + var i; - for (var i = 0; i < n.length; i++) { - if (ns[n[i]] == null) + for (i = 0; i < n.length; i++) { + if (ns[n[i]] == null) { ns[n[i]] = { rows: [], o: null }; + } ns[n[i]].rows.push(i); } - for (var i = 0; i < o.length; i++) { - if (os[o[i]] == null) + for (i = 0; i < o.length; i++) { + if (os[o[i]] == null) { os[o[i]] = { rows: [], n: null }; + } os[o[i]].rows.push(i); } - for (var i in ns) { + for (i in ns) { + if ( !hasOwn.call( ns, i ) ) { + continue; + } if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) { n[ns[i].rows[0]] = { text: n[ns[i].rows[0]], @@ -1461,7 +1572,7 @@ QUnit.diff = (function() { } } - for (var i = 0; i < n.length - 1; i++) { + for (i = 0; i < n.length - 1; i++) { if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null && n[i + 1] == o[n[i].row + 1]) { n[i + 1] = { @@ -1475,7 +1586,7 @@ QUnit.diff = (function() { } } - for (var i = n.length - 1; i > 0; i--) { + for (i = n.length - 1; i > 0; i--) { if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null && n[i - 1] == o[n[i].row - 1]) { n[i - 1] = { @@ -1498,9 +1609,10 @@ QUnit.diff = (function() { return function(o, n) { o = o.replace(/\s+$/, ''); n = n.replace(/\s+$/, ''); - var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/)); + var out = diff(o === "" ? [] : o.split(/\s+/), n === "" ? [] : n.split(/\s+/)); var str = ""; + var i; var oSpace = o.match(/\s+/g); if (oSpace == null) { @@ -1517,8 +1629,8 @@ QUnit.diff = (function() { nSpace.push(" "); } - if (out.n.length == 0) { - for (var i = 0; i < out.o.length; i++) { + if (out.n.length === 0) { + for (i = 0; i < out.o.length; i++) { str += '' + out.o[i] + oSpace[i] + ""; } } @@ -1529,7 +1641,7 @@ QUnit.diff = (function() { } } - for (var i = 0; i < out.n.length; i++) { + for (i = 0; i < out.n.length; i++) { if (out.n[i].text == null) { str += '' + out.n[i] + nSpace[i] + ""; } @@ -1546,6 +1658,12 @@ QUnit.diff = (function() { return str; }; -})(); +}()); + +// for CommonJS enviroments, export everything +if ( typeof exports !== "undefined" || typeof require !== "undefined" ) { + extend(exports, QUnit); +} -})(this); +// get at whatever the global object is, like window in browsers +}( (function() {return this;}.call()) ));