Skip to content

B
bootstrap
Commit 2f76821a authored by fat's avatar fat
Browse files
Options

new qunit

parent bc074d54
Hide whitespace changes
Inline Side-by-side
Showing with 1755 additions and 1090 deletions
js/collapse.js
View file @ 2f76821a
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
var data = $this.data('bs.collapse') var data = $this.data('bs.collapse')
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
if (!data && options.toggle && option == 'show') option = !option
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]() if (typeof option == 'string') data[option]()
}) })
......
js/tests/index.html
View file @ 2f76821a
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</script> </script>
<!-- plugin sources --> <!-- plugin sources -->
<script src="../../js/transition.js"></script> <script>$.support.transition = false</script>
<script src="../../js/alert.js"></script> <script src="../../js/alert.js"></script>
<script src="../../js/button.js"></script> <script src="../../js/button.js"></script>
<script src="../../js/carousel.js"></script> <script src="../../js/carousel.js"></script>
...@@ -47,10 +47,7 @@ ...@@ -47,10 +47,7 @@
</head> </head>
<body> <body>
<div> <div>
<h1 id="qunit-header">Bootstrap Plugin Test Suite</h1> <div id="qunit"></div>
<h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>
<div id="qunit-fixture"></div> <div id="qunit-fixture"></div>
</div> </div>
</body> </body>
......
js/tests/unit/modal.js
View file @ 2f76821a
...@@ -157,16 +157,15 @@ $(function () { ...@@ -157,16 +157,15 @@ $(function () {
test('should trigger hide event once when clicking outside of modal-content', function () { test('should trigger hide event once when clicking outside of modal-content', function () {
stop() stop()
$.support.transition = false $.support.transition = false
var div = $('<div id="modal-test"><div class="contents"></div></div>')
var triggered var triggered
var div = $('<div id="modal-test"><div class="contents"></div></div>')
div div
.bind('shown.bs.modal', function () { .bind('shown.bs.modal', function () {
triggered = 0 triggered = 0
$('#modal-test').click() $('#modal-test').click()
}) })
.one('hidden.bs.modal', function () {
div.modal('show')
})
.bind('hide.bs.modal', function () { .bind('hide.bs.modal', function () {
triggered += 1 triggered += 1
ok(triggered === 1, 'modal hide triggered once') ok(triggered === 1, 'modal hide triggered once')
......
js/tests/unit/tab.js
View file @ 2f76821a
...@@ -73,11 +73,14 @@ $(function () { ...@@ -73,11 +73,14 @@ $(function () {
'</ul>' '</ul>'
$(dropHTML).find('ul>li:first a').tab('show').end() $(dropHTML).find('ul>li:first a').tab('show').end()
.find('ul>li:last a').on('show', function (event) { .find('ul>li:last a')
.on('show.bs.tab', function (event) {
equal(event.relatedTarget.hash, '#1-1') equal(event.relatedTarget.hash, '#1-1')
}).on('shown', function (event) { })
.on('show.bs.tab', function (event) {
equal(event.relatedTarget.hash, '#1-1') equal(event.relatedTarget.hash, '#1-1')
}).tab('show') })
.tab('show')
}) })
}) })
js/tests/unit/tooltip.js
View file @ 2f76821a
...@@ -387,6 +387,8 @@ $(function () { ...@@ -387,6 +387,8 @@ $(function () {
}) })
test('tooltips should be placed dynamically, with the dynamic placement option', function () { test('tooltips should be placed dynamically, with the dynamic placement option', function () {
$(document.body).scrollTop(0) // force to top of page
$.support.transition = false $.support.transition = false
var ttContainer = $('<div id="dynamic-tt-test"/>').css({ var ttContainer = $('<div id="dynamic-tt-test"/>').css({
'height' : 400, 'height' : 400,
...@@ -402,7 +404,6 @@ $(function () { ...@@ -402,7 +404,6 @@ $(function () {
.tooltip({placement: 'auto'}) .tooltip({placement: 'auto'})
.tooltip('show') .tooltip('show')
ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom') ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom')
topTooltip.tooltip('hide') topTooltip.tooltip('hide')
......
js/tests/unit/transition.js deleted 100644 → 0
View file @ bc074d54
$(function () {
module('transition')
test('should be defined on jquery support object', function () {
ok($.support.transition !== undefined, 'transition object is defined')
})
test('should provide an end object', function () {
ok($.support.transition ? $.support.transition.end : true, 'end string is defined')
})
})
js/tests/vendor/jquery.js
View file @ 2f76821a
This source diff could not be displayed because it is too large. You can view the blob instead.
js/tests/vendor/qunit.css
View file @ 2f76821a
/** /*!
* QUnit 1.0.0 - A JavaScript Unit Testing Framework * QUnit 1.13.0
* http://qunitjs.com/
* *
* http://docs.jquery.com/QUnit * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
* *
* Copyright (c) 2011 John Resig, Jörn Zaefferer * Date: 2014-01-04T17:09Z
* Dual licensed under the MIT (MIT-LICENSE.txt)
* or GPL (GPL-LICENSE.txt) licenses.
*/ */
/** Font Family and Sizes */ /** Font Family and Sizes */
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
/** Resets */ /** Resets */
#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult { #qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
...@@ -38,10 +39,10 @@ ...@@ -38,10 +39,10 @@
line-height: 1em; line-height: 1em;
font-weight: normal; font-weight: normal;
border-radius: 15px 15px 0 0; border-radius: 5px 5px 0 0;
-moz-border-radius: 15px 15px 0 0; -moz-border-radius: 5px 5px 0 0;
-webkit-border-top-right-radius: 15px; -webkit-border-top-right-radius: 5px;
-webkit-border-top-left-radius: 15px; -webkit-border-top-left-radius: 5px;
} }
#qunit-header a { #qunit-header a {
...@@ -54,6 +55,11 @@ ...@@ -54,6 +55,11 @@
color: #fff; color: #fff;
} }
#qunit-testrunner-toolbar label {
display: inline-block;
padding: 0 .5em 0 .1em;
}
#qunit-banner { #qunit-banner {
height: 5px; height: 5px;
} }
...@@ -62,6 +68,7 @@ ...@@ -62,6 +68,7 @@
padding: 0.5em 0 0.5em 2em; padding: 0.5em 0 0.5em 2em;
color: #5E740B; color: #5E740B;
background-color: #eee; background-color: #eee;
overflow: hidden;
} }
#qunit-userAgent { #qunit-userAgent {
...@@ -71,6 +78,9 @@ ...@@ -71,6 +78,9 @@
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px; text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
} }
#qunit-modulefilter-container {
float: right;
}
/** Tests: Pass/Fail */ /** Tests: Pass/Fail */
...@@ -102,19 +112,24 @@ ...@@ -102,19 +112,24 @@
color: #000; color: #000;
} }
#qunit-tests ol { #qunit-tests li .runtime {
float: right;
font-size: smaller;
}
.qunit-assert-list {
margin-top: 0.5em; margin-top: 0.5em;
padding: 0.5em; padding: 0.5em;
background-color: #fff; background-color: #fff;
border-radius: 15px; border-radius: 5px;
-moz-border-radius: 15px; -moz-border-radius: 5px;
-webkit-border-radius: 15px; -webkit-border-radius: 5px;
}
box-shadow: inset 0px 2px 13px #999; .qunit-collapsed {
-moz-box-shadow: inset 0px 2px 13px #999; display: none;
-webkit-box-shadow: inset 0px 2px 13px #999;
} }
#qunit-tests table { #qunit-tests table {
...@@ -157,8 +172,7 @@ ...@@ -157,8 +172,7 @@
#qunit-tests b.failed { color: #710909; } #qunit-tests b.failed { color: #710909; }
#qunit-tests li li { #qunit-tests li li {
margin: 0.5em; padding: 5px;
padding: 0.4em 0.5em 0.4em 0.5em;
background-color: #fff; background-color: #fff;
border-bottom: none; border-bottom: none;
list-style-position: inside; list-style-position: inside;
...@@ -167,9 +181,9 @@ ...@@ -167,9 +181,9 @@
/*** Passing Styles */ /*** Passing Styles */
#qunit-tests li li.pass { #qunit-tests li li.pass {
color: #5E740B; color: #3c510c;
background-color: #fff; background-color: #fff;
border-left: 26px solid #C6E746; border-left: 10px solid #C6E746;
} }
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; } #qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
...@@ -185,15 +199,15 @@ ...@@ -185,15 +199,15 @@
#qunit-tests li li.fail { #qunit-tests li li.fail {
color: #710909; color: #710909;
background-color: #fff; background-color: #fff;
border-left: 26px solid #EE5757; border-left: 10px solid #EE5757;
white-space: pre; white-space: pre;
} }
#qunit-tests > li:last-child { #qunit-tests > li:last-child {
border-radius: 0 0 15px 15px; border-radius: 0 0 5px 5px;
-moz-border-radius: 0 0 15px 15px; -moz-border-radius: 0 0 5px 5px;
-webkit-border-bottom-right-radius: 15px; -webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 15px; -webkit-border-bottom-left-radius: 5px;
} }
#qunit-tests .fail { color: #000000; background-color: #EE5757; } #qunit-tests .fail { color: #000000; background-color: #EE5757; }
...@@ -216,6 +230,9 @@ ...@@ -216,6 +230,9 @@
border-bottom: 1px solid white; border-bottom: 1px solid white;
} }
#qunit-testresult .module-name {
font-weight: bold;
}
/** Fixture */ /** Fixture */
...@@ -223,4 +240,6 @@ ...@@ -223,4 +240,6 @@
position: absolute; position: absolute;
top: -10000px; top: -10000px;
left: -10000px; left: -10000px;
width: 1000px;
height: 1000px;
} }
js/tests/vendor/qunit.js
View file @ 2f76821a
/** /*!
* QUnit 1.0.0 - A JavaScript Unit Testing Framework * QUnit 1.13.0
* http://qunitjs.com/
* *
* http://docs.jquery.com/QUnit * Copyright 2013 jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
* *
* Copyright (c) 2011 John Resig, Jörn Zaefferer * Date: 2014-01-04T17:09Z
* Dual licensed under the MIT (MIT-LICENSE.txt)
* or GPL (GPL-LICENSE.txt) licenses.
*/ */
(function(window) { (function( window ) {
var defined = { var QUnit,
setTimeout: typeof window.setTimeout !== "undefined", assert,
sessionStorage: (function() { config,
try { onErrorFnPrev,
return !!sessionStorage.getItem; testId = 0,
} catch(e) { fileName = (sourceFromStacktrace( 0 ) || "" ).replace(/(:\d+)+\)?/, "").replace(/.+\//, ""),
return false; toString = Object.prototype.toString,
} hasOwn = Object.prototype.hasOwnProperty,
})() // Keep a local reference to Date (GH-283)
}; Date = window.Date,
setTimeout = window.setTimeout,
var testId = 0; defined = {
document: typeof window.document !== "undefined",
var Test = function(name, testName, expected, testEnvironmentArg, async, callback) { setTimeout: typeof window.setTimeout !== "undefined",
this.name = name; sessionStorage: (function() {
this.testName = testName; var x = "qunit-test-string";
this.expected = expected; try {
this.testEnvironmentArg = testEnvironmentArg; sessionStorage.setItem( x, x );
this.async = async; sessionStorage.removeItem( x );
this.callback = callback; return true;
this.assertions = []; } catch( e ) {
}; return false;
Test.prototype = {
init: function() {
var tests = id("qunit-tests");
if (tests) {
var b = document.createElement("strong");
b.innerHTML = "Running " + this.name;
var li = document.createElement("li");
li.appendChild( b );
li.className = "running";
li.id = this.id = "test-output" + testId++;
tests.appendChild( li );
}
},
setup: function() {
if (this.module != config.previousModule) {
if ( config.previousModule ) {
runLoggingCallbacks('moduleDone', QUnit, {
name: config.previousModule,
failed: config.moduleStats.bad,
passed: config.moduleStats.all - config.moduleStats.bad,
total: config.moduleStats.all
} );
}
config.previousModule = this.module;
config.moduleStats = { all: 0, bad: 0 };
runLoggingCallbacks( 'moduleStart', QUnit, {
name: this.module
} );
}
config.current = this;
this.testEnvironment = extend({
setup: function() {},
teardown: function() {}
}, this.moduleTestEnvironment);
if (this.testEnvironmentArg) {
extend(this.testEnvironment, this.testEnvironmentArg);
}
runLoggingCallbacks( 'testStart', QUnit, {
name: this.testName,
module: this.module
});
// allow utility functions to access the current test environment
// TODO why??
QUnit.current_testEnvironment = this.testEnvironment;
try {
if ( !config.pollution ) {
saveGlobal();
}
this.testEnvironment.setup.call(this.testEnvironment);
} catch(e) {
QUnit.ok( false, "Setup failed on " + this.testName + ": " + e.message );
}
},
run: function() {
if ( this.async ) {
QUnit.stop();
}
if ( config.notrycatch ) {
this.callback.call(this.testEnvironment);
return;
}
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) );
// else next test will carry the responsibility
saveGlobal();
// Restart the tests if they're blocking
if ( config.blocking ) {
start();
} }
} }())
},
teardown: function() {
try {
this.testEnvironment.teardown.call(this.testEnvironment);
checkPollution();
} catch(e) {
QUnit.ok( false, "Teardown failed on " + this.testName + ": " + e.message );
}
}, },
finish: function() { /**
if ( this.expected && this.expected != this.assertions.length ) { * Provides a normalized error string, correcting an issue
QUnit.ok( false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" ); * with IE 7 (and prior) where Error.prototype.toString is
} * not properly implemented
*
var good = 0, bad = 0, * Based on http://es5.github.com/#x15.11.4.4
tests = id("qunit-tests"); *
* @param {String|Error} error
config.stats.all += this.assertions.length; * @return {String} error message
config.moduleStats.all += this.assertions.length; */
errorString = function( error ) {
if ( tests ) { var name, message,
var ol = document.createElement("ol"); errorString = error.toString();
if ( errorString.substring( 0, 7 ) === "[object" ) {
for ( var i = 0; i < this.assertions.length; i++ ) { name = error.name ? error.name.toString() : "Error";
var assertion = this.assertions[i]; message = error.message ? error.message.toString() : "";
if ( name && message ) {
var li = document.createElement("li"); return name + ": " + message;
li.className = assertion.result ? "pass" : "fail"; } else if ( name ) {
li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed"); return name;
ol.appendChild( li ); } else if ( message ) {
return message;
if ( assertion.result ) { } else {
good++; return "Error";
} else {
bad++;
config.stats.bad++;
config.moduleStats.bad++;
}
}
// store result when possible
if ( QUnit.config.reorder && defined.sessionStorage ) {
if (bad) {
sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad);
} else {
sessionStorage.removeItem("qunit-" + this.module + "-" + this.testName);
}
}
if (bad == 0) {
ol.style.display = "none";
} }
var b = document.createElement("strong");
b.innerHTML = this.name + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
var a = document.createElement("a");
a.innerHTML = "Rerun";
a.href = QUnit.url({ filter: getText([b]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
addEvent(b, "click", function() {
var next = b.nextSibling.nextSibling,
display = next.style.display;
next.style.display = display === "none" ? "block" : "none";
});
addEvent(b, "dblclick", function(e) {
var target = e && e.target ? e.target : window.event.srcElement;
if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
target = target.parentNode;
}
if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
window.location = QUnit.url({ filter: getText([target]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
}
});
var li = id(this.id);
li.className = bad ? "fail" : "pass";
li.removeChild( li.firstChild );
li.appendChild( b );
li.appendChild( a );
li.appendChild( ol );
} else { } else {
for ( var i = 0; i < this.assertions.length; i++ ) { return errorString;
if ( !this.assertions[i].result ) {
bad++;
config.stats.bad++;
config.moduleStats.bad++;
}
}
}
try {
QUnit.reset();
} catch(e) {
fail("reset() failed, following Test " + this.testName + ", exception and reset fn follows", e, QUnit.reset);
} }
runLoggingCallbacks( 'testDone', QUnit, {
name: this.testName,
module: this.module,
failed: bad,
passed: this.assertions.length - bad,
total: this.assertions.length
} );
}, },
/**
queue: function() { * Makes a clone of an object using only Array or Object as base,
var test = this; * and copies over the own enumerable properties.
synchronize(function() { *
test.init(); * @param {Object} obj
}); * @return {Object} New object with only the own properties (recursively).
function run() { */
// each of these can by async objectValues = function( obj ) {
synchronize(function() { // Grunt 0.3.x uses an older version of jshint that still has jshint/jshint#392.
test.setup(); /*jshint newcap: false */
}); var key, val,
synchronize(function() { vals = QUnit.is( "array", obj ) ? [] : {};
test.run(); for ( key in obj ) {
}); if ( hasOwn.call( obj, key ) ) {
synchronize(function() { val = obj[key];
test.teardown(); vals[key] = val === Object(val) ? objectValues(val) : val;
}); }
synchronize(function() {
test.finish();
});
} }
// defer when previous test run passed, if storage is available return vals;
var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-" + this.module + "-" + this.testName); };
if (bad) {
run();
} else {
synchronize(run);
};
}
};
var QUnit = { // Root QUnit object.
// `QUnit` initialized at top of scope
QUnit = {
// call on start of module test to prepend name to all tests // call on start of module test to prepend name to all tests
module: function(name, testEnvironment) { module: function( name, testEnvironment ) {
config.currentModule = name; config.currentModule = name;
config.currentModuleTestEnviroment = testEnvironment; config.currentModuleTestEnvironment = testEnvironment;
config.modules[name] = true;
}, },
asyncTest: function(testName, expected, callback) { asyncTest: function( testName, expected, callback ) {
if ( arguments.length === 2 ) { if ( arguments.length === 2 ) {
callback = expected; callback = expected;
expected = 0; expected = null;
} }
QUnit.test(testName, expected, callback, true); QUnit.test( testName, expected, callback, true );
}, },
test: function(testName, expected, callback, async) { test: function( testName, expected, callback, async ) {
var name = '<span class="test-name">' + testName + '</span>', testEnvironmentArg; var test,
nameHtml = "<span class='test-name'>" + escapeText( testName ) + "</span>";
if ( arguments.length === 2 ) { if ( arguments.length === 2 ) {
callback = expected; callback = expected;
expected = null; expected = null;
} }
// is 2nd argument a testEnvironment?
if ( expected && typeof expected === 'object') {
testEnvironmentArg = expected;
expected = null;
}
if ( config.currentModule ) { if ( config.currentModule ) {
name = '<span class="module-name">' + config.currentModule + "</span>: " + name; nameHtml = "<span class='module-name'>" + escapeText( config.currentModule ) + "</span>: " + nameHtml;
} }
if ( !validTest(config.currentModule + ": " + testName) ) { test = new Test({
nameHtml: nameHtml,
testName: testName,
expected: expected,
async: async,
callback: callback,
module: config.currentModule,
moduleTestEnvironment: config.currentModuleTestEnvironment,
stack: sourceFromStacktrace( 2 )
});
if ( !validTest( test ) ) {
return; return;
} }
var test = new Test(name, testName, expected, testEnvironmentArg, async, callback);
test.module = config.currentModule;
test.moduleTestEnvironment = config.currentModuleTestEnviroment;
test.queue(); test.queue();
}, },
/** // Specify the number of expected assertions to guarantee 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 ) {
*/ if (arguments.length === 1) {
expect: function(asserts) { config.current.expected = asserts;
config.current.expected = asserts; } else {
}, return config.current.expected;
/**
* Asserts true.
* @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
*/
ok: function(a, msg) {
a = !!a;
var details = {
result: a,
message: msg
};
msg = escapeInnerText(msg);
runLoggingCallbacks( 'log', QUnit, details );
config.current.assertions.push({
result: a,
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)
*/
equal: function(actual, expected, message) {
QUnit.push(expected == actual, actual, expected, message);
},
notEqual: function(actual, expected, message) {
QUnit.push(expected != actual, actual, expected, message);
},
deepEqual: function(actual, expected, message) {
QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
},
notDeepEqual: function(actual, expected, message) {
QUnit.push(!QUnit.equiv(actual, expected), actual, expected, message);
},
strictEqual: function(actual, expected, message) {
QUnit.push(expected === actual, actual, expected, message);
},
notStrictEqual: function(actual, expected, message) {
QUnit.push(expected !== actual, actual, expected, message);
},
raises: function(block, expected, message) {
var actual, ok = false;
if (typeof expected === 'string') {
message = expected;
expected = null;
}
try {
block();
} catch (e) {
actual = e;
} }
},
if (actual) { start: function( count ) {
// we don't want to validate thrown error // QUnit hasn't been initialized yet.
if (!expected) { // Note: RequireJS (et al) may delay onLoad
ok = true; if ( config.semaphore === undefined ) {
// expected is a regexp QUnit.begin(function() {
} else if (QUnit.objectType(expected) === "regexp") { // This is triggered at the top of QUnit.load, push start() to the event loop, to allow QUnit.load to finish first
ok = expected.test(actual); setTimeout(function() {
// expected is a constructor QUnit.start( count );
} else if (actual instanceof expected) { });
ok = true; });
// expected is a validation function which returns true is validation passed return;
} else if (expected.call({}, actual) === true) {
ok = true;
}
} }
QUnit.ok(ok, message);
},
start: function(count) {
config.semaphore -= count || 1; config.semaphore -= count || 1;
if (config.semaphore > 0) { // don't start until equal number of stop-calls
// don't start until equal number of stop-calls if ( config.semaphore > 0 ) {
return; return;
} }
if (config.semaphore < 0) { // ignore if start is called more often then stop
// ignore if start is called more often then stop if ( config.semaphore < 0 ) {
config.semaphore = 0; config.semaphore = 0;
QUnit.pushFailure( "Called start() while already started (QUnit.config.semaphore was 0 already)", null, sourceFromStacktrace(2) );
return;
} }
// A slight delay, to avoid any current callbacks // A slight delay, to avoid any current callbacks
if ( defined.setTimeout ) { if ( defined.setTimeout ) {
window.setTimeout(function() { setTimeout(function() {
if (config.semaphore > 0) { if ( config.semaphore > 0 ) {
return; return;
} }
if ( config.timeout ) { if ( config.timeout ) {
clearTimeout(config.timeout); clearTimeout( config.timeout );
} }
config.blocking = false; config.blocking = false;
process(); process( true );
}, 13); }, 13);
} else { } else {
config.blocking = false; config.blocking = false;
process(); process( true );
} }
}, },
stop: function(count) { stop: function( count ) {
config.semaphore += count || 1; config.semaphore += count || 1;
config.blocking = true; config.blocking = true;
if ( config.testTimeout && defined.setTimeout ) { if ( config.testTimeout && defined.setTimeout ) {
clearTimeout(config.timeout); clearTimeout( config.timeout );
config.timeout = window.setTimeout(function() { config.timeout = setTimeout(function() {
QUnit.ok( false, "Test timed out" ); QUnit.ok( false, "Test timed out" );
config.semaphore = 1; config.semaphore = 1;
QUnit.start(); QUnit.start();
}, config.testTimeout); }, config.testTimeout );
} }
} }
}; };
//We want access to the constructor's prototype // We use the prototype to distinguish between properties that should
// be exposed as globals (and in exports) and those that shouldn't
(function() { (function() {
function F(){}; function F() {}
F.prototype = QUnit; F.prototype = QUnit;
QUnit = new F(); QUnit = new F();
//Make F QUnit's constructor so that we can add to the prototype later // Make F QUnit's constructor so that we can add to the prototype later
QUnit.constructor = F; QUnit.constructor = F;
})(); }());
// Backwards compatibility, deprecated
QUnit.equals = QUnit.equal;
QUnit.same = QUnit.deepEqual;
// Maintain internal state /**
var config = { * Config object: Maintain internal state
* Later exposed as QUnit.config
* `config` initialized at top of scope
*/
config = {
// The queue of tests to run // The queue of tests to run
queue: [], queue: [],
...@@ -465,9 +238,28 @@ var config = { ...@@ -465,9 +238,28 @@ var config = {
// by default, modify document.title when suite is done // by default, modify document.title when suite is done
altertitle: true, altertitle: true,
urlConfig: ['noglobals', 'notrycatch'], // when enabled, all tests must call expect()
requireExpects: false,
// add checkboxes that are persisted in the query-string
// when enabled, the id is set to `true` as a `QUnit.config` property
urlConfig: [
{
id: "noglobals",
label: "Check for Globals",
tooltip: "Enabling this will test if any test introduces new properties on the `window` object. Stored as query-strings."
},
{
id: "notrycatch",
label: "No try-catch",
tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."
}
],
// Set of all modules.
modules: {},
//logging callback queues // logging callback queues
begin: [], begin: [],
done: [], done: [],
log: [], log: [],
...@@ -477,16 +269,17 @@ var config = { ...@@ -477,16 +269,17 @@ var config = {
moduleDone: [] moduleDone: []
}; };
// Load paramaters // Initialize more QUnit.config and QUnit.urlParams
(function() { (function() {
var location = window.location || { search: "", protocol: "file:" }, var i,
location = window.location || { search: "", protocol: "file:" },
params = location.search.slice( 1 ).split( "&" ), params = location.search.slice( 1 ).split( "&" ),
length = params.length, length = params.length,
urlParams = {}, urlParams = {},
current; current;
if ( params[ 0 ] ) { if ( params[ 0 ] ) {
for ( var i = 0; i < length; i++ ) { for ( i = 0; i < length; i++ ) {
current = params[ i ].split( "=" ); current = params[ i ].split( "=" );
current[ 0 ] = decodeURIComponent( current[ 0 ] ); current[ 0 ] = decodeURIComponent( current[ 0 ] );
// allow just a key to turn on a flag, e.g., test.html?noglobals // allow just a key to turn on a flag, e.g., test.html?noglobals
...@@ -496,44 +289,53 @@ var config = { ...@@ -496,44 +289,53 @@ var config = {
} }
QUnit.urlParams = urlParams; QUnit.urlParams = urlParams;
// String search anywhere in moduleName+testName
config.filter = urlParams.filter; config.filter = urlParams.filter;
// Exact match of the module name
config.module = urlParams.module;
config.testNumber = parseInt( urlParams.testNumber, 10 ) || null;
// Figure out if we're running the tests from a server or not // 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' extend( QUnit, {
// object exists, in that case we assume we're in CommonJS
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
extend(QUnit, {
config: config, config: config,
// Initialize the configuration options // Initialize the configuration options
init: function() { init: function() {
extend(config, { extend( config, {
stats: { all: 0, bad: 0 }, stats: { all: 0, bad: 0 },
moduleStats: { all: 0, bad: 0 }, moduleStats: { all: 0, bad: 0 },
started: +new Date, started: +new Date(),
updateRate: 1000, updateRate: 1000,
blocking: false, blocking: false,
autostart: true, autostart: true,
autorun: false, autorun: false,
filter: "", filter: "",
queue: [], queue: [],
semaphore: 0 semaphore: 1
}); });
var tests = id( "qunit-tests" ), var tests, banner, result,
banner = id( "qunit-banner" ), qunit = id( "qunit" );
result = id( "qunit-testresult" );
if ( qunit ) {
qunit.innerHTML =
"<h1 id='qunit-header'>" + escapeText( document.title ) + "</h1>" +
"<h2 id='qunit-banner'></h2>" +
"<div id='qunit-testrunner-toolbar'></div>" +
"<h2 id='qunit-userAgent'></h2>" +
"<ol id='qunit-tests'></ol>";
}
tests = id( "qunit-tests" );
banner = id( "qunit-banner" );
result = id( "qunit-testresult" );
if ( tests ) { if ( tests ) {
tests.innerHTML = ""; tests.innerHTML = "";
...@@ -552,112 +354,101 @@ extend(QUnit, { ...@@ -552,112 +354,101 @@ extend(QUnit, {
result.id = "qunit-testresult"; result.id = "qunit-testresult";
result.className = "result"; result.className = "result";
tests.parentNode.insertBefore( result, tests ); tests.parentNode.insertBefore( result, tests );
result.innerHTML = 'Running...<br/>&nbsp;'; result.innerHTML = "Running...<br/>&nbsp;";
} }
}, },
/** // Resets the test setup. Useful for tests that modify the DOM.
* Resets the test setup. Useful for tests that modify the DOM. /*
* DEPRECATED: Use multiple tests instead of resetting inside a test.
* If jQuery is available, uses jQuery's html(), otherwise just innerHTML. Use testStart or testDone for custom cleanup.
*/ This method will throw an error in 2.0, and will be removed in 2.1
*/
reset: function() { reset: function() {
if ( window.jQuery ) { var fixture = id( "qunit-fixture" );
jQuery( "#qunit-fixture" ).html( config.fixture ); if ( fixture ) {
} else { fixture.innerHTML = config.fixture;
var main = id( 'qunit-fixture' );
if ( main ) {
main.innerHTML = config.fixture;
}
}
},
/**
* Trigger an event on an element.
*
* @example triggerEvent( document.body, "click" );
*
* @param DOMElement elem
* @param String type
*/
triggerEvent: function( elem, type, event ) {
if ( document.createEvent ) {
event = document.createEvent("MouseEvents");
event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
0, 0, 0, 0, 0, false, false, false, false, 0, null);
elem.dispatchEvent( event );
} else if ( elem.fireEvent ) {
elem.fireEvent("on"+type);
} }
}, },
// Safe object type checking // Safe object type checking
is: function( type, obj ) { is: function( type, obj ) {
return QUnit.objectType( obj ) == type; return QUnit.objectType( obj ) === type;
}, },
objectType: function( obj ) { objectType: function( obj ) {
if (typeof obj === "undefined") { if ( typeof obj === "undefined" ) {
return "undefined"; return "undefined";
// consider: typeof null === object
} }
if (obj === null) {
return "null"; // Consider: typeof null === object
if ( obj === null ) {
return "null";
} }
var type = Object.prototype.toString.call( obj ) var match = toString.call( obj ).match(/^\[object\s(.*)\]$/),
.match(/^\[object\s(.*)\]$/)[1] || ''; type = match && match[1] || "";
switch (type) { switch ( type ) {
case 'Number': case "Number":
if (isNaN(obj)) { if ( isNaN(obj) ) {
return "nan"; return "nan";
} else { }
return "number"; return "number";
} case "String":
case 'String': case "Boolean":
case 'Boolean': case "Array":
case 'Array': case "Date":
case 'Date': case "RegExp":
case 'RegExp': case "Function":
case 'Function': return type.toLowerCase();
return type.toLowerCase();
} }
if (typeof obj === "object") { if ( typeof obj === "object" ) {
return "object"; return "object";
} }
return undefined; return undefined;
}, },
push: function(result, actual, expected, message) { push: function( result, actual, expected, message ) {
var details = { if ( !config.current ) {
result: result, throw new Error( "assertion outside test context, was " + sourceFromStacktrace() );
message: message, }
actual: actual,
expected: expected
};
message = escapeInnerText(message) || (result ? "okay" : "failed"); var output, source,
message = '<span class="test-message">' + message + "</span>"; details = {
expected = escapeInnerText(QUnit.jsDump.parse(expected)); module: config.current.module,
actual = escapeInnerText(QUnit.jsDump.parse(actual)); name: config.current.testName,
var output = message + '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>'; result: result,
if (actual != expected) { message: message,
output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>'; actual: actual,
output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) +'</pre></td></tr>'; expected: expected
} };
if (!result) {
var source = sourceFromStacktrace(); message = escapeText( message ) || ( result ? "okay" : "failed" );
if (source) { message = "<span class='test-message'>" + message + "</span>";
details.source = source; output = message;
output += '<tr class="test-source"><th>Source: </th><td><pre>' + escapeInnerText(source) + '</pre></td></tr>';
if ( !result ) {
expected = escapeText( QUnit.jsDump.parse(expected) );
actual = escapeText( QUnit.jsDump.parse(actual) );
output += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + expected + "</pre></td></tr>";
if ( actual !== expected ) {
output += "<tr class='test-actual'><th>Result: </th><td><pre>" + actual + "</pre></td></tr>";
output += "<tr class='test-diff'><th>Diff: </th><td><pre>" + QUnit.diff( expected, actual ) + "</pre></td></tr>";
} }
}
output += "</table>";
runLoggingCallbacks( 'log', QUnit, details ); source = sourceFromStacktrace();
if ( source ) {
details.source = source;
output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText( source ) + "</pre></td></tr>";
}
output += "</table>";
}
runLoggingCallbacks( "log", QUnit, details );
config.current.assertions.push({ config.current.assertions.push({
result: !!result, result: !!result,
...@@ -665,257 +456,507 @@ extend(QUnit, { ...@@ -665,257 +456,507 @@ extend(QUnit, {
}); });
}, },
pushFailure: function( message, source, actual ) {
if ( !config.current ) {
throw new Error( "pushFailure() assertion outside test context, was " + sourceFromStacktrace(2) );
}
var output,
details = {
module: config.current.module,
name: config.current.testName,
result: false,
message: message
};
message = escapeText( message ) || "error";
message = "<span class='test-message'>" + message + "</span>";
output = message;
output += "<table>";
if ( actual ) {
output += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeText( actual ) + "</pre></td></tr>";
}
if ( source ) {
details.source = source;
output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText( source ) + "</pre></td></tr>";
}
output += "</table>";
runLoggingCallbacks( "log", QUnit, details );
config.current.assertions.push({
result: false,
message: output
});
},
url: function( params ) { url: function( params ) {
params = extend( extend( {}, QUnit.urlParams ), params ); params = extend( extend( {}, QUnit.urlParams ), params );
var querystring = "?", var key,
key; querystring = "?";
for ( key in params ) { for ( key in params ) {
querystring += encodeURIComponent( key ) + "=" + if ( hasOwn.call( params, key ) ) {
encodeURIComponent( params[ key ] ) + "&"; querystring += encodeURIComponent( key ) + "=" +
encodeURIComponent( params[ key ] ) + "&";
}
} }
return window.location.pathname + querystring.slice( 0, -1 ); return window.location.protocol + "//" + window.location.host +
window.location.pathname + querystring.slice( 0, -1 );
}, },
extend: extend, extend: extend,
id: id, id: id,
addEvent: addEvent addEvent: addEvent,
addClass: addClass,
hasClass: hasClass,
removeClass: removeClass
// load, equiv, jsDump, diff: Attached later
}); });
//QUnit.constructor is set to the empty F() above so that we can add to it's prototype later /**
//Doing this allows us to tell if the following methods have been overwritten on the actual * @deprecated: Created for backwards compatibility with test runner that set the hook function
//QUnit object, which is a deprecated way of using the callbacks. * into QUnit.{hook}, instead of invoking it and passing the hook function.
extend(QUnit.constructor.prototype, { * QUnit.constructor is set to the empty F() above so that we can add to it's prototype here.
* Doing this allows us to tell if the following methods have been overwritten on the actual
* QUnit object.
*/
extend( QUnit.constructor.prototype, {
// Logging callbacks; all receive a single argument with the listed properties // Logging callbacks; all receive a single argument with the listed properties
// run test/logs.html for any related changes // run test/logs.html for any related changes
begin: registerLoggingCallback('begin'), begin: registerLoggingCallback( "begin" ),
// done: { failed, passed, total, runtime } // done: { failed, passed, total, runtime }
done: registerLoggingCallback('done'), done: registerLoggingCallback( "done" ),
// log: { result, actual, expected, message } // log: { result, actual, expected, message }
log: registerLoggingCallback('log'), log: registerLoggingCallback( "log" ),
// testStart: { name } // testStart: { name }
testStart: registerLoggingCallback('testStart'), testStart: registerLoggingCallback( "testStart" ),
// testDone: { name, failed, passed, total }
testDone: registerLoggingCallback('testDone'), // testDone: { name, failed, passed, total, runtime }
testDone: registerLoggingCallback( "testDone" ),
// moduleStart: { name } // moduleStart: { name }
moduleStart: registerLoggingCallback('moduleStart'), moduleStart: registerLoggingCallback( "moduleStart" ),
// moduleDone: { name, failed, passed, total } // moduleDone: { name, failed, passed, total }
moduleDone: registerLoggingCallback('moduleDone') moduleDone: registerLoggingCallback( "moduleDone" )
}); });
if ( typeof document === "undefined" || document.readyState === "complete" ) { if ( !defined.document || document.readyState === "complete" ) {
config.autorun = true; config.autorun = true;
} }
QUnit.load = function() { QUnit.load = function() {
runLoggingCallbacks( 'begin', QUnit, {} ); runLoggingCallbacks( "begin", QUnit, {} );
// Initialize the config, saving the execution queue // Initialize the config, saving the execution queue
var oldconfig = extend({}, config); var banner, filter, i, label, len, main, ol, toolbar, userAgent, val,
urlConfigCheckboxesContainer, urlConfigCheckboxes, moduleFilter,
numModules = 0,
moduleNames = [],
moduleFilterHtml = "",
urlConfigHtml = "",
oldconfig = extend( {}, config );
QUnit.init(); QUnit.init();
extend(config, oldconfig); extend(config, oldconfig);
config.blocking = false; config.blocking = false;
var urlConfigHtml = '', len = config.urlConfig.length; len = config.urlConfig.length;
for ( var i = 0, val; i < len, val = config.urlConfig[i]; i++ ) {
config[val] = QUnit.urlParams[val]; for ( i = 0; i < len; i++ ) {
urlConfigHtml += '<label><input name="' + val + '" type="checkbox"' + ( config[val] ? ' checked="checked"' : '' ) + '>' + val + '</label>'; val = config.urlConfig[i];
if ( typeof val === "string" ) {
val = {
id: val,
label: val,
tooltip: "[no tooltip available]"
};
}
config[ val.id ] = QUnit.urlParams[ val.id ];
urlConfigHtml += "<input id='qunit-urlconfig-" + escapeText( val.id ) +
"' name='" + escapeText( val.id ) +
"' type='checkbox'" + ( config[ val.id ] ? " checked='checked'" : "" ) +
" title='" + escapeText( val.tooltip ) +
"'><label for='qunit-urlconfig-" + escapeText( val.id ) +
"' title='" + escapeText( val.tooltip ) + "'>" + val.label + "</label>";
}
for ( i in config.modules ) {
if ( config.modules.hasOwnProperty( i ) ) {
moduleNames.push(i);
}
}
numModules = moduleNames.length;
moduleNames.sort( function( a, b ) {
return a.localeCompare( b );
});
moduleFilterHtml += "<label for='qunit-modulefilter'>Module: </label><select id='qunit-modulefilter' name='modulefilter'><option value='' " +
( config.module === undefined ? "selected='selected'" : "" ) +
">< All Modules ></option>";
for ( i = 0; i < numModules; i++) {
moduleFilterHtml += "<option value='" + escapeText( encodeURIComponent(moduleNames[i]) ) + "' " +
( config.module === moduleNames[i] ? "selected='selected'" : "" ) +
">" + escapeText(moduleNames[i]) + "</option>";
} }
moduleFilterHtml += "</select>";
var userAgent = id("qunit-userAgent"); // `userAgent` initialized at top of scope
userAgent = id( "qunit-userAgent" );
if ( userAgent ) { if ( userAgent ) {
userAgent.innerHTML = navigator.userAgent; userAgent.innerHTML = navigator.userAgent;
} }
var banner = id("qunit-header");
// `banner` initialized at top of scope
banner = id( "qunit-header" );
if ( banner ) { if ( banner ) {
banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' + urlConfigHtml; banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined, module: undefined, testNumber: undefined }) + "'>" + banner.innerHTML + "</a> ";
addEvent( banner, "change", function( event ) {
var params = {};
params[ event.target.name ] = event.target.checked ? true : undefined;
window.location = QUnit.url( params );
});
} }
var toolbar = id("qunit-testrunner-toolbar"); // `toolbar` initialized at top of scope
toolbar = id( "qunit-testrunner-toolbar" );
if ( toolbar ) { if ( toolbar ) {
var filter = document.createElement("input"); // `filter` initialized at top of scope
filter = document.createElement( "input" );
filter.type = "checkbox"; filter.type = "checkbox";
filter.id = "qunit-filter-pass"; filter.id = "qunit-filter-pass";
addEvent( filter, "click", function() { addEvent( filter, "click", function() {
var ol = document.getElementById("qunit-tests"); var tmp,
ol = id( "qunit-tests" );
if ( filter.checked ) { if ( filter.checked ) {
ol.className = ol.className + " hidepass"; ol.className = ol.className + " hidepass";
} else { } else {
var tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " "; tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
ol.className = tmp.replace(/ hidepass /, " "); ol.className = tmp.replace( / hidepass /, " " );
} }
if ( defined.sessionStorage ) { if ( defined.sessionStorage ) {
if (filter.checked) { if (filter.checked) {
sessionStorage.setItem("qunit-filter-passed-tests", "true"); sessionStorage.setItem( "qunit-filter-passed-tests", "true" );
} else { } else {
sessionStorage.removeItem("qunit-filter-passed-tests"); sessionStorage.removeItem( "qunit-filter-passed-tests" );
} }
} }
}); });
if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem("qunit-filter-passed-tests") ) {
if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem( "qunit-filter-passed-tests" ) ) {
filter.checked = true; filter.checked = true;
var ol = document.getElementById("qunit-tests"); // `ol` initialized at top of scope
ol = id( "qunit-tests" );
ol.className = ol.className + " hidepass"; ol.className = ol.className + " hidepass";
} }
toolbar.appendChild( filter ); toolbar.appendChild( filter );
var label = document.createElement("label"); // `label` initialized at top of scope
label.setAttribute("for", "qunit-filter-pass"); label = document.createElement( "label" );
label.setAttribute( "for", "qunit-filter-pass" );
label.setAttribute( "title", "Only show tests and assertions that fail. Stored in sessionStorage." );
label.innerHTML = "Hide passed tests"; label.innerHTML = "Hide passed tests";
toolbar.appendChild( label ); toolbar.appendChild( label );
urlConfigCheckboxesContainer = document.createElement("span");
urlConfigCheckboxesContainer.innerHTML = urlConfigHtml;
urlConfigCheckboxes = urlConfigCheckboxesContainer.getElementsByTagName("input");
// For oldIE support:
// * Add handlers to the individual elements instead of the container
// * Use "click" instead of "change"
// * Fallback from event.target to event.srcElement
addEvents( urlConfigCheckboxes, "click", function( event ) {
var params = {},
target = event.target || event.srcElement;
params[ target.name ] = target.checked ? true : undefined;
window.location = QUnit.url( params );
});
toolbar.appendChild( urlConfigCheckboxesContainer );
if (numModules > 1) {
moduleFilter = document.createElement( "span" );
moduleFilter.setAttribute( "id", "qunit-modulefilter-container" );
moduleFilter.innerHTML = moduleFilterHtml;
addEvent( moduleFilter.lastChild, "change", function() {
var selectBox = moduleFilter.getElementsByTagName("select")[0],
selectedModule = decodeURIComponent(selectBox.options[selectBox.selectedIndex].value);
window.location = QUnit.url({
module: ( selectedModule === "" ) ? undefined : selectedModule,
// Remove any existing filters
filter: undefined,
testNumber: undefined
});
});
toolbar.appendChild(moduleFilter);
}
} }
var main = id('qunit-fixture'); // `main` initialized at top of scope
main = id( "qunit-fixture" );
if ( main ) { if ( main ) {
config.fixture = main.innerHTML; config.fixture = main.innerHTML;
} }
if (config.autostart) { if ( config.autostart ) {
QUnit.start(); QUnit.start();
} }
}; };
addEvent(window, "load", QUnit.load); if ( defined.document ) {
addEvent( window, "load", QUnit.load );
}
// `onErrorFnPrev` initialized at top of scope
// Preserve other handlers
onErrorFnPrev = window.onerror;
// Cover uncaught exceptions
// Returning true will suppress the default browser handler,
// returning false will let it run.
window.onerror = function ( error, filePath, linerNr ) {
var ret = false;
if ( onErrorFnPrev ) {
ret = onErrorFnPrev( error, filePath, linerNr );
}
// Treat return value as window.onerror itself does,
// Only do our handling if not suppressed.
if ( ret !== true ) {
if ( QUnit.config.current ) {
if ( QUnit.config.current.ignoreGlobalErrors ) {
return true;
}
QUnit.pushFailure( error, filePath + ":" + linerNr );
} else {
QUnit.test( "global failure", extend( function() {
QUnit.pushFailure( error, filePath + ":" + linerNr );
}, { validTest: validTest } ) );
}
return false;
}
return ret;
};
function done() { function done() {
config.autorun = true; config.autorun = true;
// Log the last module results // Log the last module results
if ( config.currentModule ) { if ( config.previousModule ) {
runLoggingCallbacks( 'moduleDone', QUnit, { runLoggingCallbacks( "moduleDone", QUnit, {
name: config.currentModule, name: config.previousModule,
failed: config.moduleStats.bad, failed: config.moduleStats.bad,
passed: config.moduleStats.all - config.moduleStats.bad, passed: config.moduleStats.all - config.moduleStats.bad,
total: config.moduleStats.all total: config.moduleStats.all
} ); });
} }
delete config.previousModule;
var banner = id("qunit-banner"), var i, key,
tests = id("qunit-tests"), banner = id( "qunit-banner" ),
runtime = +new Date - config.started, tests = id( "qunit-tests" ),
runtime = +new Date() - config.started,
passed = config.stats.all - config.stats.bad, passed = config.stats.all - config.stats.bad,
html = [ html = [
'Tests completed in ', "Tests completed in ",
runtime, runtime,
' milliseconds.<br/>', " milliseconds.<br/>",
'<span class="passed">', "<span class='passed'>",
passed, passed,
'</span> tests of <span class="total">', "</span> assertions of <span class='total'>",
config.stats.all, config.stats.all,
'</span> passed, <span class="failed">', "</span> passed, <span class='failed'>",
config.stats.bad, config.stats.bad,
'</span> failed.' "</span> failed."
].join(''); ].join( "" );
if ( banner ) { if ( banner ) {
banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass"); banner.className = ( config.stats.bad ? "qunit-fail" : "qunit-pass" );
} }
if ( tests ) { if ( tests ) {
id( "qunit-testresult" ).innerHTML = html; id( "qunit-testresult" ).innerHTML = html;
} }
if ( config.altertitle && typeof document !== "undefined" && document.title ) { if ( config.altertitle && defined.document && document.title ) {
// show ✖ for good, ✔ for bad suite result in title // show ✖ for good, ✔ for bad suite result in title
// use escape sequences in case file gets loaded with non-utf-8-charset // use escape sequences in case file gets loaded with non-utf-8-charset
document.title = [ document.title = [
(config.stats.bad ? "\u2716" : "\u2714"), ( config.stats.bad ? "\u2716" : "\u2714" ),
document.title.replace(/^[\u2714\u2716] /i, "") document.title.replace( /^[\u2714\u2716] /i, "" )
].join(" "); ].join( " " );
}
// clear own sessionStorage items if all tests passed
if ( config.reorder && defined.sessionStorage && config.stats.bad === 0 ) {
// `key` & `i` initialized at top of scope
for ( i = 0; i < sessionStorage.length; i++ ) {
key = sessionStorage.key( i++ );
if ( key.indexOf( "qunit-test-" ) === 0 ) {
sessionStorage.removeItem( key );
}
}
} }
runLoggingCallbacks( 'done', QUnit, { // scroll back to top to show results
if ( window.scrollTo ) {
window.scrollTo(0, 0);
}
runLoggingCallbacks( "done", QUnit, {
failed: config.stats.bad, failed: config.stats.bad,
passed: passed, passed: passed,
total: config.stats.all, total: config.stats.all,
runtime: runtime runtime: runtime
} ); });
} }
function validTest( name ) { /** @return Boolean: true if this test should be ran */
var filter = config.filter, function validTest( test ) {
run = false; var include,
filter = config.filter && config.filter.toLowerCase(),
module = config.module && config.module.toLowerCase(),
fullName = (test.module + ": " + test.testName).toLowerCase();
if ( !filter ) { // Internally-generated tests are always valid
if ( test.callback && test.callback.validTest === validTest ) {
delete test.callback.validTest;
return true; return true;
} }
var not = filter.charAt( 0 ) === "!"; if ( config.testNumber ) {
if ( not ) { return test.testNumber === config.testNumber;
filter = filter.slice( 1 ); }
if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) {
return false;
}
if ( !filter ) {
return true;
} }
if ( name.indexOf( filter ) !== -1 ) { include = filter.charAt( 0 ) !== "!";
return !not; if ( !include ) {
filter = filter.slice( 1 );
} }
if ( not ) { // If the filter matches, we need to honour include
run = true; if ( fullName.indexOf( filter ) !== -1 ) {
return include;
} }
return run; // Otherwise, do the opposite
return !include;
} }
// so far supports only Firefox, Chrome and Opera (buggy) // so far supports only Firefox, Chrome and Opera (buggy), Safari (for real exceptions)
// could be extended in the future to use something like https://github.com/csnover/TraceKit // Later Safari and IE10 are supposed to support error.stack as well
function sourceFromStacktrace() { // See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
function extractStacktrace( e, offset ) {
offset = offset === undefined ? 3 : offset;
var stack, include, i;
if ( e.stacktrace ) {
// Opera
return e.stacktrace.split( "\n" )[ offset + 3 ];
} else if ( e.stack ) {
// Firefox, Chrome
stack = e.stack.split( "\n" );
if (/^error$/i.test( stack[0] ) ) {
stack.shift();
}
if ( fileName ) {
include = [];
for ( i = offset; i < stack.length; i++ ) {
if ( stack[ i ].indexOf( fileName ) !== -1 ) {
break;
}
include.push( stack[ i ] );
}
if ( include.length ) {
return include.join( "\n" );
}
}
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 { try {
throw new Error(); throw new Error();
} catch ( e ) { } catch ( e ) {
if (e.stacktrace) { return extractStacktrace( e, offset );
// 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;
}
} }
} }
function escapeInnerText(s) { /**
if (!s) { * Escape text for attribute or text content.
*/
function escapeText( s ) {
if ( !s ) {
return ""; return "";
} }
s = s + ""; s = s + "";
return s.replace(/[\&<>]/g, function(s) { // Both single quotes and double quotes (for attributes)
switch(s) { return s.replace( /['"<>&]/g, function( s ) {
case "&": return "&amp;"; switch( s ) {
case "<": return "&lt;"; case "'":
case ">": return "&gt;"; return "&#039;";
default: return s; case "\"":
return "&quot;";
case "<":
return "&lt;";
case ">":
return "&gt;";
case "&":
return "&amp;";
} }
}); });
} }
function synchronize( callback ) { function synchronize( callback, last ) {
config.queue.push( callback ); config.queue.push( callback );
if ( config.autorun && !config.blocking ) { if ( config.autorun && !config.blocking ) {
process(); process( last );
} }
} }
function process() { function process( last ) {
var start = (new Date()).getTime(); function next() {
process( last );
}
var start = new Date().getTime();
config.depth = config.depth ? config.depth + 1 : 1;
while ( config.queue.length && !config.blocking ) { 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()(); config.queue.shift()();
} else { } else {
window.setTimeout( process, 13 ); setTimeout( next, 13 );
break; break;
} }
} }
if (!config.blocking && !config.queue.length) { config.depth--;
if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) {
done(); done();
} }
} }
...@@ -925,33 +966,44 @@ function saveGlobal() { ...@@ -925,33 +966,44 @@ function saveGlobal() {
if ( config.noglobals ) { if ( config.noglobals ) {
for ( var key in window ) { for ( var key in window ) {
config.pollution.push( key ); if ( hasOwn.call( window, key ) ) {
// in Opera sometimes DOM element ids show up here, ignore them
if ( /^qunit-test-output/.test( key ) ) {
continue;
}
config.pollution.push( key );
}
} }
} }
} }
function checkPollution( name ) { function checkPollution() {
var old = config.pollution; var newGlobals,
deletedGlobals,
old = config.pollution;
saveGlobal(); saveGlobal();
var newGlobals = diff( config.pollution, old ); newGlobals = diff( config.pollution, old );
if ( newGlobals.length > 0 ) { 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 ); deletedGlobals = diff( old, config.pollution );
if ( deletedGlobals.length > 0 ) { if ( deletedGlobals.length > 0 ) {
ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") ); QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join(", ") );
} }
} }
// returns a new Array with the elements that are in a but not in b // returns a new Array with the elements that are in a but not in b
function diff( a, b ) { function diff( a, b ) {
var result = a.slice(); var i, j,
for ( var i = 0; i < result.length; i++ ) { result = a.slice();
for ( var j = 0; j < b.length; j++ ) {
for ( i = 0; i < result.length; i++ ) {
for ( j = 0; j < b.length; j++ ) {
if ( result[i] === b[j] ) { if ( result[i] === b[j] ) {
result.splice(i, 1); result.splice( i, 1 );
i--; i--;
break; break;
} }
...@@ -960,457 +1012,1037 @@ function diff( a, b ) { ...@@ -960,457 +1012,1037 @@ function diff( a, b ) {
return result; return result;
} }
function fail(message, exception, callback) { function extend( a, b ) {
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 ) { for ( var prop in b ) {
if ( b[prop] === undefined ) { if ( hasOwn.call( b, prop ) ) {
delete a[prop]; // Avoid "Member not found" error in IE8 caused by messing with window.constructor
} else { if ( !( prop === "constructor" && a === window ) ) {
a[prop] = b[prop]; if ( b[ prop ] === undefined ) {
delete a[ prop ];
} else {
a[ prop ] = b[ prop ];
}
}
} }
} }
return a; return a;
} }
function addEvent(elem, type, fn) { /**
* @param {HTMLElement} elem
* @param {string} type
* @param {Function} fn
*/
function addEvent( elem, type, fn ) {
if ( elem.addEventListener ) { if ( elem.addEventListener ) {
// Standards-based browsers
elem.addEventListener( type, fn, false ); elem.addEventListener( type, fn, false );
} else if ( elem.attachEvent ) { } else if ( elem.attachEvent ) {
// support: IE <9
elem.attachEvent( "on" + type, fn ); elem.attachEvent( "on" + type, fn );
} else { } else {
fn();
// Caller must ensure support for event listeners is present
throw new Error( "addEvent() was called in a context without event listener support" );
}
}
/**
* @param {Array|NodeList} elems
* @param {string} type
* @param {Function} fn
*/
function addEvents( elems, type, fn ) {
var i = elems.length;
while ( i-- ) {
addEvent( elems[i], type, fn );
}
}
function hasClass( elem, name ) {
return (" " + elem.className + " ").indexOf(" " + name + " ") > -1;
}
function addClass( elem, name ) {
if ( !hasClass( elem, name ) ) {
elem.className += (elem.className ? " " : "") + name;
} }
} }
function id(name) { function removeClass( elem, name ) {
return !!(typeof document !== "undefined" && document && document.getElementById) && var set = " " + elem.className + " ";
document.getElementById( name ); // Class name may appear multiple times
while ( set.indexOf(" " + name + " ") > -1 ) {
set = set.replace(" " + name + " " , " ");
}
// If possible, trim it for prettiness, but not necessarily
elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, "");
}
function id( name ) {
return defined.document && document.getElementById && document.getElementById( name );
} }
function registerLoggingCallback(key){ function registerLoggingCallback( key ) {
return function(callback){ return function( callback ) {
config[key].push( callback ); config[key].push( callback );
}; };
} }
// Supports deprecated method of completely overwriting logging callbacks // Supports deprecated method of completely overwriting logging callbacks
function runLoggingCallbacks(key, scope, args) { function runLoggingCallbacks( key, scope, args ) {
//debugger; var i, callbacks;
var callbacks; if ( QUnit.hasOwnProperty( key ) ) {
if ( QUnit.hasOwnProperty(key) ) { QUnit[ key ].call(scope, args );
QUnit[key].call(scope, args);
} else { } else {
callbacks = config[key]; callbacks = config[ key ];
for( var i = 0; i < callbacks.length; i++ ) { for ( i = 0; i < callbacks.length; i++ ) {
callbacks[i].call( scope, args ); callbacks[ i ].call( scope, args );
} }
} }
} }
// Test for equality any JavaScript type. // from jquery.js
// Author: Philippe Rathé <prathe@gmail.com> function inArray( elem, array ) {
QUnit.equiv = function () { if ( array.indexOf ) {
return array.indexOf( elem );
var innerEquiv; // the real equiv function }
var callers = []; // stack to decide between skip/abort functions
var parents = []; // stack to avoiding loops from circular referencing
// Call the o related callback with the given arguments. for ( var i = 0, length = array.length; i < length; i++ ) {
function bindCallbacks(o, callbacks, args) { if ( array[ i ] === elem ) {
var prop = QUnit.objectType(o); return i;
if (prop) {
if (QUnit.objectType(callbacks[prop]) === "function") {
return callbacks[prop].apply(callbacks, args);
} else {
return callbacks[prop]; // or undefined
}
} }
} }
var callbacks = function () { return -1;
}
// for string, boolean, number and null function Test( settings ) {
function useStrictEquality(b, a) { extend( this, settings );
if (b instanceof a.constructor || a instanceof b.constructor) { this.assertions = [];
// to catch short annotaion VS 'new' annotation of a this.testNumber = ++Test.count;
// declaration }
// e.g. var i = 1;
// var j = new Number(1);
return a == b;
} else {
return a === b;
}
}
return { Test.count = 0;
"string" : useStrictEquality,
"boolean" : useStrictEquality,
"number" : useStrictEquality,
"null" : useStrictEquality,
"undefined" : useStrictEquality,
"nan" : function(b) {
return isNaN(b);
},
"date" : function(b, a) { Test.prototype = {
return QUnit.objectType(b) === "date" init: function() {
&& a.valueOf() === b.valueOf(); var a, b, li,
}, tests = id( "qunit-tests" );
"regexp" : function(b, a) { if ( tests ) {
return QUnit.objectType(b) === "regexp" b = document.createElement( "strong" );
&& a.source === b.source && // the regex itself b.innerHTML = this.nameHtml;
a.global === b.global && // and its modifers
// (gmi) ...
a.ignoreCase === b.ignoreCase
&& a.multiline === b.multiline;
},
// - skip when the property is a method of an instance (OOP) // `a` initialized at top of scope
// - abort otherwise, a = document.createElement( "a" );
// initial === would have catch identical references anyway a.innerHTML = "Rerun";
"function" : function() { a.href = QUnit.url({ testNumber: this.testNumber });
var caller = callers[callers.length - 1];
return caller !== Object && typeof caller !== "undefined";
},
"array" : function(b, a) { li = document.createElement( "li" );
var i, j, loop; li.appendChild( b );
var len; li.appendChild( a );
li.className = "running";
li.id = this.id = "qunit-test-output" + testId++;
// b could be an object literal here tests.appendChild( li );
if (!(QUnit.objectType(b) === "array")) { }
return false; },
} setup: function() {
if (
// Emit moduleStart when we're switching from one module to another
this.module !== config.previousModule ||
// They could be equal (both undefined) but if the previousModule property doesn't
// yet exist it means this is the first test in a suite that isn't wrapped in a
// module, in which case we'll just emit a moduleStart event for 'undefined'.
// Without this, reporters can get testStart before moduleStart which is a problem.
!hasOwn.call( config, "previousModule" )
) {
if ( hasOwn.call( config, "previousModule" ) ) {
runLoggingCallbacks( "moduleDone", QUnit, {
name: config.previousModule,
failed: config.moduleStats.bad,
passed: config.moduleStats.all - config.moduleStats.bad,
total: config.moduleStats.all
});
}
config.previousModule = this.module;
config.moduleStats = { all: 0, bad: 0 };
runLoggingCallbacks( "moduleStart", QUnit, {
name: this.module
});
}
len = a.length; config.current = this;
if (len !== b.length) { // safe and faster
return false;
}
// track reference to avoid circular references this.testEnvironment = extend({
parents.push(a); setup: function() {},
for (i = 0; i < len; i++) { teardown: function() {}
loop = false; }, this.moduleTestEnvironment );
for (j = 0; j < parents.length; j++) {
if (parents[j] === a[i]) {
loop = true;// dont rewalk array
}
}
if (!loop && !innerEquiv(a[i], b[i])) {
parents.pop();
return false;
}
}
parents.pop();
return true;
},
"object" : function(b, a) { this.started = +new Date();
var i, j, loop; runLoggingCallbacks( "testStart", QUnit, {
var eq = true; // unless we can proove it name: this.testName,
var aProperties = [], bProperties = []; // collection of module: this.module
// strings });
// comparing constructors is more strict than using /*jshint camelcase:false */
// instanceof
if (a.constructor !== b.constructor) {
return false;
}
// stack constructor before traversing properties
callers.push(a.constructor);
// track reference to avoid circular references
parents.push(a);
for (i in a) { // be strict: don't ensures hasOwnProperty
// 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
}
aProperties.push(i); // collect a's properties
if (!loop && !innerEquiv(a[i], b[i])) { /**
eq = false; * Expose the current test environment.
break; *
} * @deprecated since 1.12.0: Use QUnit.config.current.testEnvironment instead.
} */
QUnit.current_testEnvironment = this.testEnvironment;
callers.pop(); // unstack, we are done /*jshint camelcase:true */
parents.pop();
for (i in b) { if ( !config.pollution ) {
bProperties.push(i); // collect b's properties saveGlobal();
} }
if ( config.notrycatch ) {
this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
return;
}
try {
this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
} catch( e ) {
QUnit.pushFailure( "Setup failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
}
},
run: function() {
config.current = this;
// Ensures identical properties name var running = id( "qunit-testresult" );
return eq
&& innerEquiv(aProperties.sort(), bProperties
.sort());
}
};
}();
innerEquiv = function() { // can take multiple arguments if ( running ) {
var args = Array.prototype.slice.apply(arguments); running.innerHTML = "Running: <br/>" + this.nameHtml;
if (args.length < 2) {
return true; // end transition
} }
return (function(a, b) { if ( this.async ) {
if (a === b) { QUnit.stop();
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)) {
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));
};
return innerEquiv; this.callbackStarted = +new Date();
}(); if ( config.notrycatch ) {
this.callback.call( this.testEnvironment, QUnit.assert );
this.callbackRuntime = +new Date() - this.callbackStarted;
return;
}
/** try {
* jsDump Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | this.callback.call( this.testEnvironment, QUnit.assert );
* http://flesler.blogspot.com Licensed under BSD this.callbackRuntime = +new Date() - this.callbackStarted;
* (http://www.opensource.org/licenses/bsd-license.php) Date: 5/15/2008 } catch( e ) {
* this.callbackRuntime = +new Date() - this.callbackStarted;
* @projectDescription Advanced and extensible data dumping for Javascript.
* @version 1.0.0
* @author Ariel Flesler
* @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
*/
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 )
arr = arr.join( ',' + s + inner );
if ( !arr )
return pre + post;
return [ pre, inner + arr, base + post ].join(s);
};
function array( arr, stack ) {
var i = arr.length, ret = Array(i);
this.up();
while ( i-- )
ret[i] = this.parse( arr[i] , undefined , stack);
this.down();
return join( '[', ret, ']' );
};
var reName = /^function (\w+)/; QUnit.pushFailure( "Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + ( e.message || e ), extractStacktrace( e, 0 ) );
// else next test will carry the responsibility
saveGlobal();
var jsDump = { // Restart the tests if they're blocking
parse:function( obj, type, stack ) { //type is used mostly internally, you can fix a (custom)type in advance if ( config.blocking ) {
stack = stack || [ ]; QUnit.start();
var parser = this.parsers[ type || this.typeOf(obj) ];
type = typeof parser;
var inStack = inArray(obj, stack);
if (inStack != -1) {
return 'recursion('+(inStack - stack.length)+')';
} }
//else }
if (type == 'function') { },
stack.push(obj); teardown: function() {
var res = parser.call( this, obj, stack ); config.current = this;
stack.pop(); if ( config.notrycatch ) {
return res; if ( typeof this.callbackRuntime === "undefined" ) {
this.callbackRuntime = +new Date() - this.callbackStarted;
} }
// else this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
return (type == 'string') ? parser : this.parsers.error; return;
}, } else {
typeOf:function( obj ) { try {
var type; this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
if ( obj === null ) { } catch( e ) {
type = "null"; QUnit.pushFailure( "Teardown failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
} else if (typeof obj === "undefined") {
type = "undefined";
} else if (QUnit.is("RegExp", obj)) {
type = "regexp";
} else if (QUnit.is("Date", obj)) {
type = "date";
} else if (QUnit.is("Function", obj)) {
type = "function";
} else if (typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined") {
type = "window";
} else if (obj.nodeType === 9) {
type = "document";
} else if (obj.nodeType) {
type = "node";
} else if (typeof obj === "object" && typeof obj.length === "number" && obj.length >= 0) {
type = "array";
} else {
type = typeof obj;
} }
return type; }
}, checkPollution();
separator:function() { },
return this.multiline ? this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' '; finish: function() {
}, config.current = this;
indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing if ( config.requireExpects && this.expected === null ) {
if ( !this.multiline ) QUnit.pushFailure( "Expected number of assertions to be defined, but expect() was not called.", this.stack );
return ''; } else if ( this.expected !== null && this.expected !== this.assertions.length ) {
var chr = this.indentChar; QUnit.pushFailure( "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack );
if ( this.HTML ) } else if ( this.expected === null && !this.assertions.length ) {
chr = chr.replace(/\t/g,' ').replace(/ /g,'&nbsp;'); QUnit.pushFailure( "Expected at least one assertion, but none were run - call expect(0) to accept zero assertions.", this.stack );
return Array( this._depth_ + (extra||0) ).join(chr); }
},
up:function( a ) { var i, assertion, a, b, time, li, ol,
this._depth_ += a || 1; test = this,
}, good = 0,
down:function( a ) { bad = 0,
this._depth_ -= a || 1; tests = id( "qunit-tests" );
},
setParser:function( name, parser ) { this.runtime = +new Date() - this.started;
this.parsers[name] = parser; config.stats.all += this.assertions.length;
}, config.moduleStats.all += this.assertions.length;
// The next 3 are exposed so you can use them
quote:quote, if ( tests ) {
literal:literal, ol = document.createElement( "ol" );
join:join, ol.className = "qunit-assert-list";
//
_depth_: 1, for ( i = 0; i < this.assertions.length; i++ ) {
// This is the list of parsers, to modify them, use jsDump.setParser assertion = this.assertions[i];
parsers:{
window: '[Window]',
document: '[Document]',
error:'[ERROR]', //when no parser is found, shouldn't happen
unknown: '[Unknown]',
'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 )
ret += ' ' + name;
ret += '(';
ret = [ ret, QUnit.jsDump.parse( fn, 'functionArgs' ), '){'].join('');
return join( ret, QUnit.jsDump.parse(fn,'functionCode'), '}' );
},
array: array,
nodelist: array,
arguments: array,
object:function( map, stack ) {
var ret = [ ];
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));
}
QUnit.jsDump.down();
return join( '{', ret, '}' );
},
node:function( node ) {
var open = QUnit.jsDump.HTML ? '&lt;' : '<',
close = QUnit.jsDump.HTML ? '&gt;' : '>';
var tag = node.nodeName.toLowerCase(), li = document.createElement( "li" );
ret = open + tag; li.className = assertion.result ? "pass" : "fail";
li.innerHTML = assertion.message || ( assertion.result ? "okay" : "failed" );
ol.appendChild( li );
for ( var a in QUnit.jsDump.DOMAttrs ) { if ( assertion.result ) {
var val = node[QUnit.jsDump.DOMAttrs[a]]; good++;
if ( val ) } else {
ret += ' ' + a + '=' + QUnit.jsDump.parse( val, 'attribute' ); bad++;
config.stats.bad++;
config.moduleStats.bad++;
} }
return ret + close + open + '/' + tag + close; }
},
functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
var l = fn.length;
if ( !l ) return '';
var args = 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
},
DOMAttrs:{//attributes to dump from nodes, name=>realName
id:'id',
name:'name',
'class':'className'
},
HTML:false,//if true, entities are escaped ( <, >, \t, space and \n )
indentChar:' ',//indentation unit
multiline:true //if true, items in a collection, are separated by a \n, else just a space.
};
return jsDump; // store result when possible
})(); if ( QUnit.config.reorder && defined.sessionStorage ) {
if ( bad ) {
sessionStorage.setItem( "qunit-test-" + this.module + "-" + this.testName, bad );
} else {
sessionStorage.removeItem( "qunit-test-" + this.module + "-" + this.testName );
}
}
// from Sizzle.js if ( bad === 0 ) {
function getText( elems ) { addClass( ol, "qunit-collapsed" );
var ret = "", elem; }
for ( var i = 0; elems[i]; i++ ) { // `b` initialized at top of scope
elem = elems[i]; b = document.createElement( "strong" );
b.innerHTML = this.nameHtml + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
addEvent(b, "click", function() {
var next = b.parentNode.lastChild,
collapsed = hasClass( next, "qunit-collapsed" );
( collapsed ? removeClass : addClass )( next, "qunit-collapsed" );
});
addEvent(b, "dblclick", function( e ) {
var target = e && e.target ? e.target : window.event.srcElement;
if ( target.nodeName.toLowerCase() === "span" || target.nodeName.toLowerCase() === "b" ) {
target = target.parentNode;
}
if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
window.location = QUnit.url({ testNumber: test.testNumber });
}
});
// Get the text from text nodes and CDATA nodes // `time` initialized at top of scope
if ( elem.nodeType === 3 || elem.nodeType === 4 ) { time = document.createElement( "span" );
ret += elem.nodeValue; time.className = "runtime";
time.innerHTML = this.runtime + " ms";
// Traverse everything else, except comment nodes // `li` initialized at top of scope
} else if ( elem.nodeType !== 8 ) { li = id( this.id );
ret += getText( elem.childNodes ); li.className = bad ? "fail" : "pass";
li.removeChild( li.firstChild );
a = li.firstChild;
li.appendChild( b );
li.appendChild( a );
li.appendChild( time );
li.appendChild( ol );
} else {
for ( i = 0; i < this.assertions.length; i++ ) {
if ( !this.assertions[i].result ) {
bad++;
config.stats.bad++;
config.moduleStats.bad++;
}
}
}
runLoggingCallbacks( "testDone", QUnit, {
name: this.testName,
module: this.module,
failed: bad,
passed: this.assertions.length - bad,
total: this.assertions.length,
runtime: this.runtime,
// DEPRECATED: this property will be removed in 2.0.0, use runtime instead
duration: this.runtime,
});
QUnit.reset();
config.current = undefined;
},
queue: function() {
var bad,
test = this;
synchronize(function() {
test.init();
});
function run() {
// each of these can by async
synchronize(function() {
test.setup();
});
synchronize(function() {
test.run();
});
synchronize(function() {
test.teardown();
});
synchronize(function() {
test.finish();
});
}
// `bad` initialized at top of scope
// defer when previous test run passed, if storage is available
bad = QUnit.config.reorder && defined.sessionStorage &&
+sessionStorage.getItem( "qunit-test-" + this.module + "-" + this.testName );
if ( bad ) {
run();
} else {
synchronize( run, true );
} }
} }
};
return ret; // `assert` initialized at top of scope
// Assert helpers
// All of these must either call QUnit.push() or manually do:
// - runLoggingCallbacks( "log", .. );
// - config.current.assertions.push({ .. });
assert = QUnit.assert = {
/**
* Asserts rough true-ish result.
* @name ok
* @function
* @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;
msg = msg || ( result ? "okay" : "failed" );
var source,
details = {
module: config.current.module,
name: config.current.testName,
result: result,
message: msg
};
msg = "<span class='test-message'>" + escapeText( msg ) + "</span>";
if ( !result ) {
source = sourceFromStacktrace( 2 );
if ( source ) {
details.source = source;
msg += "<table><tr class='test-source'><th>Source: </th><td><pre>" +
escapeText( source ) +
"</pre></td></tr></table>";
}
}
runLoggingCallbacks( "log", QUnit, details );
config.current.assertions.push({
result: result,
message: msg
});
},
/**
* Assert that the first two arguments are equal, with an optional message.
* Prints out both actual and expected values.
* @name equal
* @function
* @example equal( format( "Received {0} bytes.", 2), "Received 2 bytes.", "format() replaces {0} with next argument" );
*/
equal: function( actual, expected, message ) {
/*jshint eqeqeq:false */
QUnit.push( expected == actual, actual, expected, message );
},
/**
* @name notEqual
* @function
*/
notEqual: function( actual, expected, message ) {
/*jshint eqeqeq:false */
QUnit.push( expected != actual, actual, expected, message );
},
/**
* @name propEqual
* @function
*/
propEqual: function( actual, expected, message ) {
actual = objectValues(actual);
expected = objectValues(expected);
QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
},
/**
* @name notPropEqual
* @function
*/
notPropEqual: function( actual, expected, message ) {
actual = objectValues(actual);
expected = objectValues(expected);
QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
},
/**
* @name deepEqual
* @function
*/
deepEqual: function( actual, expected, message ) {
QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
},
/**
* @name notDeepEqual
* @function
*/
notDeepEqual: function( actual, expected, message ) {
QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
},
/**
* @name strictEqual
* @function
*/
strictEqual: function( actual, expected, message ) {
QUnit.push( expected === actual, actual, expected, message );
},
/**
* @name notStrictEqual
* @function
*/
notStrictEqual: function( actual, expected, message ) {
QUnit.push( expected !== actual, actual, expected, message );
},
"throws": function( block, expected, message ) {
var actual,
expectedOutput = expected,
ok = false;
// 'expected' is optional
if ( typeof expected === "string" ) {
message = expected;
expected = null;
}
config.current.ignoreGlobalErrors = true;
try {
block.call( config.current.testEnvironment );
} catch (e) {
actual = e;
}
config.current.ignoreGlobalErrors = false;
if ( actual ) {
// we don't want to validate thrown error
if ( !expected ) {
ok = true;
expectedOutput = null;
// expected is a regexp
} else if ( QUnit.objectType( expected ) === "regexp" ) {
ok = expected.test( errorString( actual ) );
// expected is a constructor
} else if ( actual instanceof expected ) {
ok = true;
// expected is a validation function which returns true is validation passed
} else if ( expected.call( {}, actual ) === true ) {
expectedOutput = null;
ok = true;
}
QUnit.push( ok, actual, expectedOutput, message );
} else {
QUnit.pushFailure( message, null, "No exception was thrown." );
}
}
}; };
//from jquery.js /**
function inArray( elem, array ) { * @deprecated since 1.8.0
if ( array.indexOf ) { * Kept assertion helpers in root for backwards compatibility.
return array.indexOf( elem ); */
extend( QUnit.constructor.prototype, assert );
/**
* @deprecated since 1.9.0
* Kept to avoid TypeErrors for undefined methods.
*/
QUnit.constructor.prototype.raises = function() {
QUnit.push( false, false, false, "QUnit.raises has been deprecated since 2012 (fad3c1ea), use QUnit.throws instead" );
};
/**
* @deprecated since 1.0.0, replaced with error pushes since 1.3.0
* Kept to avoid TypeErrors for undefined methods.
*/
QUnit.constructor.prototype.equals = function() {
QUnit.push( false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead" );
};
QUnit.constructor.prototype.same = function() {
QUnit.push( false, false, false, "QUnit.same has been deprecated since 2009 (e88049a0), use QUnit.deepEqual instead" );
};
// Test for equality any JavaScript type.
// Author: Philippe Rathé <prathe@gmail.com>
QUnit.equiv = (function() {
// Call the o related callback with the given arguments.
function bindCallbacks( o, callbacks, args ) {
var prop = QUnit.objectType( o );
if ( prop ) {
if ( QUnit.objectType( callbacks[ prop ] ) === "function" ) {
return callbacks[ prop ].apply( callbacks, args );
} else {
return callbacks[ prop ]; // or undefined
}
}
} }
for ( var i = 0, length = array.length; i < length; i++ ) { // the real equiv function
if ( array[ i ] === elem ) { var innerEquiv,
return i; // stack to decide between skip/abort functions
callers = [],
// stack to avoiding loops from circular referencing
parents = [],
parentsB = [],
getProto = Object.getPrototypeOf || function ( obj ) {
/*jshint camelcase:false */
return obj.__proto__;
},
callbacks = (function () {
// for string, boolean, number and null
function useStrictEquality( b, a ) {
/*jshint eqeqeq:false */
if ( b instanceof a.constructor || a instanceof b.constructor ) {
// to catch short annotation VS 'new' annotation of a
// declaration
// e.g. var i = 1;
// var j = new Number(1);
return a == b;
} else {
return a === b;
}
}
return {
"string": useStrictEquality,
"boolean": useStrictEquality,
"number": useStrictEquality,
"null": useStrictEquality,
"undefined": useStrictEquality,
"nan": function( b ) {
return isNaN( b );
},
"date": function( b, a ) {
return QUnit.objectType( b ) === "date" && a.valueOf() === b.valueOf();
},
"regexp": function( b, a ) {
return QUnit.objectType( b ) === "regexp" &&
// the regex itself
a.source === b.source &&
// and its modifiers
a.global === b.global &&
// (gmi) ...
a.ignoreCase === b.ignoreCase &&
a.multiline === b.multiline &&
a.sticky === b.sticky;
},
// - skip when the property is a method of an instance (OOP)
// - abort otherwise,
// initial === would have catch identical references anyway
"function": function() {
var caller = callers[callers.length - 1];
return caller !== Object && typeof caller !== "undefined";
},
"array": function( b, a ) {
var i, j, len, loop, aCircular, bCircular;
// b could be an object literal here
if ( QUnit.objectType( b ) !== "array" ) {
return false;
}
len = a.length;
if ( len !== b.length ) {
// safe and faster
return false;
}
// track reference to avoid circular references
parents.push( a );
parentsB.push( b );
for ( i = 0; i < len; i++ ) {
loop = false;
for ( j = 0; j < parents.length; j++ ) {
aCircular = parents[j] === a[i];
bCircular = parentsB[j] === b[i];
if ( aCircular || bCircular ) {
if ( a[i] === b[i] || aCircular && bCircular ) {
loop = true;
} else {
parents.pop();
parentsB.pop();
return false;
}
}
}
if ( !loop && !innerEquiv(a[i], b[i]) ) {
parents.pop();
parentsB.pop();
return false;
}
}
parents.pop();
parentsB.pop();
return true;
},
"object": function( b, a ) {
/*jshint forin:false */
var i, j, loop, aCircular, bCircular,
// Default to true
eq = true,
aProperties = [],
bProperties = [];
// comparing constructors is more strict than using
// instanceof
if ( a.constructor !== b.constructor ) {
// 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
callers.push( a.constructor );
// track reference to avoid circular references
parents.push( a );
parentsB.push( b );
// be strict: don't ensure hasOwnProperty and go deep
for ( i in a ) {
loop = false;
for ( j = 0; j < parents.length; j++ ) {
aCircular = parents[j] === a[i];
bCircular = parentsB[j] === b[i];
if ( aCircular || bCircular ) {
if ( a[i] === b[i] || aCircular && bCircular ) {
loop = true;
} else {
eq = false;
break;
}
}
}
aProperties.push(i);
if ( !loop && !innerEquiv(a[i], b[i]) ) {
eq = false;
break;
}
}
parents.pop();
parentsB.pop();
callers.pop(); // unstack, we are done
for ( i in b ) {
bProperties.push( i ); // collect b's properties
}
// Ensures identical properties name
return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
}
};
}());
innerEquiv = function() { // can take multiple arguments
var args = [].slice.apply( arguments );
if ( args.length < 2 ) {
return true; // end transition
}
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) ) {
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] ) && innerEquiv.apply( this, args.splice(1, args.length - 1 )) );
};
return innerEquiv;
}());
/**
* jsDump Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com |
* http://flesler.blogspot.com Licensed under BSD
* (http://www.opensource.org/licenses/bsd-license.php) Date: 5/15/2008
*
* @projectDescription Advanced and extensible data dumping for Javascript.
* @version 1.0.0
* @author Ariel Flesler
* @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
*/
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 ) {
arr = arr.join( "," + s + inner );
}
if ( !arr ) {
return pre + post;
}
return [ pre, inner + arr, base + post ].join(s);
}
function array( arr, stack ) {
var i = arr.length, ret = new Array(i);
this.up();
while ( i-- ) {
ret[i] = this.parse( arr[i] , undefined , stack);
} }
this.down();
return join( "[", ret, "]" );
} }
return -1; var reName = /^function (\w+)/,
} jsDump = {
// type is used mostly internally, you can fix a (custom)type in advance
parse: function( obj, type, stack ) {
stack = stack || [ ];
var inStack, res,
parser = this.parsers[ type || this.typeOf(obj) ];
type = typeof parser;
inStack = inArray( obj, stack );
if ( inStack !== -1 ) {
return "recursion(" + (inStack - stack.length) + ")";
}
if ( type === "function" ) {
stack.push( obj );
res = parser.call( this, obj, stack );
stack.pop();
return res;
}
return ( type === "string" ) ? parser : this.parsers.error;
},
typeOf: function( obj ) {
var type;
if ( obj === null ) {
type = "null";
} else if ( typeof obj === "undefined" ) {
type = "undefined";
} else if ( QUnit.is( "regexp", obj) ) {
type = "regexp";
} else if ( QUnit.is( "date", obj) ) {
type = "date";
} else if ( QUnit.is( "function", obj) ) {
type = "function";
} else if ( typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined" ) {
type = "window";
} else if ( obj.nodeType === 9 ) {
type = "document";
} else if ( obj.nodeType ) {
type = "node";
} 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 if ( obj.constructor === Error.prototype.constructor ) {
type = "error";
} else {
type = typeof obj;
}
return type;
},
separator: function() {
return this.multiline ? this.HTML ? "<br />" : "\n" : this.HTML ? "&nbsp;" : " ";
},
// extra can be a number, shortcut for increasing-calling-decreasing
indent: function( extra ) {
if ( !this.multiline ) {
return "";
}
var chr = this.indentChar;
if ( this.HTML ) {
chr = chr.replace( /\t/g, " " ).replace( / /g, "&nbsp;" );
}
return new Array( this.depth + ( extra || 0 ) ).join(chr);
},
up: function( a ) {
this.depth += a || 1;
},
down: function( a ) {
this.depth -= a || 1;
},
setParser: function( name, parser ) {
this.parsers[name] = parser;
},
// The next 3 are exposed so you can use them
quote: quote,
literal: literal,
join: join,
//
depth: 1,
// This is the list of parsers, to modify them, use jsDump.setParser
parsers: {
window: "[Window]",
document: "[Document]",
error: function(error) {
return "Error(\"" + error.message + "\")";
},
unknown: "[Unknown]",
"null": "null",
"undefined": "undefined",
"function": function( fn ) {
var ret = "function",
// functions never have name in IE
name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1];
if ( name ) {
ret += " " + name;
}
ret += "( ";
ret = [ ret, QUnit.jsDump.parse( fn, "functionArgs" ), "){" ].join( "" );
return join( ret, QUnit.jsDump.parse(fn,"functionCode" ), "}" );
},
array: array,
nodelist: array,
"arguments": array,
object: function( map, stack ) {
/*jshint forin:false */
var ret = [ ], keys, key, val, i;
QUnit.jsDump.up();
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 ) {
var len, i, val,
open = QUnit.jsDump.HTML ? "&lt;" : "<",
close = QUnit.jsDump.HTML ? "&gt;" : ">",
tag = node.nodeName.toLowerCase(),
ret = open + tag,
attrs = node.attributes;
if ( attrs ) {
for ( i = 0, len = attrs.length; i < len; i++ ) {
val = attrs[i].nodeValue;
// IE6 includes all attributes in .attributes, even ones not explicitly set.
// Those have values like undefined, null, 0, false, "" or "inherit".
if ( val && val !== "inherit" ) {
ret += " " + attrs[i].nodeName + "=" + QUnit.jsDump.parse( val, "attribute" );
}
}
}
ret += close;
// Show content of TextNode or CDATASection
if ( node.nodeType === 3 || node.nodeType === 4 ) {
ret += node.nodeValue;
}
return ret + open + "/" + tag + close;
},
// function calls it internally, it's the arguments part of the function
functionArgs: function( fn ) {
var args,
l = fn.length;
if ( !l ) {
return "";
}
args = new Array(l);
while ( l-- ) {
// 97 is 'a'
args[l] = String.fromCharCode(97+l);
}
return " " + args.join( ", " ) + " ";
},
// object calls it internally, the key part of an item in a map
key: quote,
// function calls it internally, it's the content of the function
functionCode: "[code]",
// node calls it internally, it's an html attribute value
attribute: quote,
string: quote,
date: quote,
regexp: literal,
number: literal,
"boolean": literal
},
// if true, entities are escaped ( <, >, \t, space and \n )
HTML: false,
// indentation unit
indentChar: " ",
// if true, items in a collection, are separated by a \n, else just a space.
multiline: true
};
return jsDump;
}());
/* /*
* Javascript Diff Algorithm * Javascript Diff Algorithm
...@@ -1424,67 +2056,75 @@ function inArray( elem, array ) { ...@@ -1424,67 +2056,75 @@ function inArray( elem, array ) {
* *
* Usage: QUnit.diff(expected, actual) * Usage: QUnit.diff(expected, actual)
* *
* QUnit.diff("the quick brown fox jumped over", "the quick fox jumps over") == "the quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over" * QUnit.diff( "the quick brown fox jumped over", "the quick fox jumps over" ) == "the quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
*/ */
QUnit.diff = (function() { QUnit.diff = (function() {
function diff(o, n) { /*jshint eqeqeq:false, eqnull:true */
var ns = {}; function diff( o, n ) {
var os = {}; var i,
ns = {},
for (var i = 0; i < n.length; i++) { os = {};
if (ns[n[i]] == null)
ns[n[i]] = { for ( i = 0; i < n.length; i++ ) {
if ( !hasOwn.call( ns, n[i] ) ) {
ns[ n[i] ] = {
rows: [], rows: [],
o: null o: null
}; };
ns[n[i]].rows.push(i); }
ns[ n[i] ].rows.push( i );
} }
for (var i = 0; i < o.length; i++) { for ( i = 0; i < o.length; i++ ) {
if (os[o[i]] == null) if ( !hasOwn.call( os, o[i] ) ) {
os[o[i]] = { os[ o[i] ] = {
rows: [], rows: [],
n: null n: null
}; };
os[o[i]].rows.push(i); }
os[ o[i] ].rows.push( i );
} }
for (var i in ns) { for ( i in ns ) {
if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) { if ( hasOwn.call( ns, i ) ) {
n[ns[i].rows[0]] = { if ( ns[i].rows.length === 1 && hasOwn.call( os, i ) && os[i].rows.length === 1 ) {
text: n[ns[i].rows[0]], n[ ns[i].rows[0] ] = {
row: os[i].rows[0] text: n[ ns[i].rows[0] ],
}; row: os[i].rows[0]
o[os[i].rows[0]] = { };
text: o[os[i].rows[0]], o[ os[i].rows[0] ] = {
row: ns[i].rows[0] text: o[ os[i].rows[0] ],
}; row: ns[i].rows[0]
};
}
} }
} }
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 && 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 ] == o[ n[i].row + 1 ] ) {
n[i + 1] = {
text: n[i + 1], n[ i + 1 ] = {
text: n[ i + 1 ],
row: n[i].row + 1 row: n[i].row + 1
}; };
o[n[i].row + 1] = { o[ n[i].row + 1 ] = {
text: o[n[i].row + 1], text: o[ n[i].row + 1 ],
row: i + 1 row: i + 1
}; };
} }
} }
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 && 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 ] == o[ n[i].row - 1 ]) {
n[i - 1] = {
text: n[i - 1], n[ i - 1 ] = {
text: n[ i - 1 ],
row: n[i].row - 1 row: n[i].row - 1
}; };
o[n[i].row - 1] = { o[ n[i].row - 1 ] = {
text: o[n[i].row - 1], text: o[ n[i].row - 1 ],
row: i - 1 row: i - 1
}; };
} }
...@@ -1496,49 +2136,52 @@ QUnit.diff = (function() { ...@@ -1496,49 +2136,52 @@ QUnit.diff = (function() {
}; };
} }
return function(o, n) { return function( o, n ) {
o = o.replace(/\s+$/, ''); o = o.replace( /\s+$/, "" );
n = n.replace(/\s+$/, ''); n = n.replace( /\s+$/, "" );
var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
var str = ""; var i, pre,
str = "",
out = diff( o === "" ? [] : o.split(/\s+/), n === "" ? [] : n.split(/\s+/) ),
oSpace = o.match(/\s+/g),
nSpace = n.match(/\s+/g);
var oSpace = o.match(/\s+/g); if ( oSpace == null ) {
if (oSpace == null) { oSpace = [ " " ];
oSpace = [" "];
} }
else { else {
oSpace.push(" "); oSpace.push( " " );
} }
var nSpace = n.match(/\s+/g);
if (nSpace == null) { if ( nSpace == null ) {
nSpace = [" "]; nSpace = [ " " ];
} }
else { else {
nSpace.push(" "); nSpace.push( " " );
} }
if (out.n.length == 0) { if ( out.n.length === 0 ) {
for (var i = 0; i < out.o.length; i++) { for ( i = 0; i < out.o.length; i++ ) {
str += '<del>' + out.o[i] + oSpace[i] + "</del>"; str += "<del>" + out.o[i] + oSpace[i] + "</del>";
} }
} }
else { else {
if (out.n[0].text == null) { if ( out.n[0].text == null ) {
for (n = 0; n < out.o.length && out.o[n].text == null; n++) { for ( n = 0; n < out.o.length && out.o[n].text == null; n++ ) {
str += '<del>' + out.o[n] + oSpace[n] + "</del>"; str += "<del>" + out.o[n] + oSpace[n] + "</del>";
} }
} }
for (var i = 0; i < out.n.length; i++) { for ( i = 0; i < out.n.length; i++ ) {
if (out.n[i].text == null) { if (out.n[i].text == null) {
str += '<ins>' + out.n[i] + nSpace[i] + "</ins>"; str += "<ins>" + out.n[i] + nSpace[i] + "</ins>";
} }
else { else {
var pre = ""; // `pre` initialized at top of scope
pre = "";
for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) { for ( n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++ ) {
pre += '<del>' + out.o[n] + oSpace[n] + "</del>"; pre += "<del>" + out.o[n] + oSpace[n] + "</del>";
} }
str += " " + out.n[i].text + nSpace[i] + pre; str += " " + out.n[i].text + nSpace[i] + pre;
} }
...@@ -1547,6 +2190,21 @@ QUnit.diff = (function() { ...@@ -1547,6 +2190,21 @@ QUnit.diff = (function() {
return str; return str;
}; };
})(); }());
// For browser, export only select globals
if ( typeof window !== "undefined" ) {
extend( window, QUnit.constructor.prototype );
window.QUnit = QUnit;
}
// For CommonJS environments, export everything
if ( typeof module !== "undefined" && module.exports ) {
module.exports = QUnit;
}
})(this); // Get a reference to the global object, like window in browsers
}( (function() {
return this;
})() ));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment