git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jquery dimensions & offset: moving the local function 'num' to core, so it can be...
[jquery.git]
/
test
/
data
/
testrunner.js
diff --git
a/test/data/testrunner.js
b/test/data/testrunner.js
index
bdb938c
..
d4fdcf5
100644
(file)
--- a/
test/data/testrunner.js
+++ b/
test/data/testrunner.js
@@
-81,6
+81,7
@@
function runTest() {
_config.blocking = false;
var time = new Date();
_config.fixture = document.getElementById('main').innerHTML;
_config.blocking = false;
var time = new Date();
_config.fixture = document.getElementById('main').innerHTML;
+ _config.ajaxSettings = $.ajaxSettings;
synchronize(function() {
time = new Date() - time;
$("<div>").html(['<p class="result">Tests completed in ',
synchronize(function() {
time = new Date() - time;
$("<div>").html(['<p class="result">Tests completed in ',
@@
-109,7
+110,7
@@
function test(name, callback, nowait) {
console.error(e);
console.warn(callback.toString());
}
console.error(e);
console.warn(callback.toString());
}
- _config.Test.push( [ false, "Died on test #" + (_config.Test.length+1) + ": " + e ] );
+ _config.Test.push( [ false, "Died on test #" + (_config.Test.length+1) + ": " + e.message ] );
}
});
synchronize(function() {
}
});
synchronize(function() {
@@
-185,6
+186,7
@@
function expect(asserts) {
function reset() {
$("#main").html( _config.fixture );
$.event.global = {};
function reset() {
$("#main").html( _config.fixture );
$.event.global = {};
+ $.ajaxSettings = $.extend({}, _config.ajaxSettings);
}
/**
}
/**