aboutsummaryrefslogtreecommitdiffstats
path: root/external
diff options
context:
space:
mode:
authorjzaefferer <joern.zaefferer@gmail.com>2010-03-27 07:34:42 +0100
committerjzaefferer <joern.zaefferer@gmail.com>2010-03-27 07:34:42 +0100
commit8d57aa18478c1b7e6ac0f7f3f87895000514ddfa (patch)
treee75d7fdadf8e350e36270f85e1bb4d8fa20f855e /external
parentccf85fd3b92a9586f54cc715e031ea51a7a2af64 (diff)
downloadjquery-ui-8d57aa18478c1b7e6ac0f7f3f87895000514ddfa.tar.gz
jquery-ui-8d57aa18478c1b7e6ac0f7f3f87895000514ddfa.zip
Updating to latest QUnit (sometime soon it'll get versioned...), fixes test output issues
Diffstat (limited to 'external')
-rw-r--r--external/qunit.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/external/qunit.js b/external/qunit.js
index 41e6c82f5..0dd315530 100644
--- a/external/qunit.js
+++ b/external/qunit.js
@@ -579,7 +579,7 @@ function validTest( name ) {
function push(result, actual, expected, message) {
message = message || (result ? "okay" : "failed");
- QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + QUnit.jsDump.parse(expected) + " result: " + QUnit.jsDump.parse(actual) );
+ QUnit.ok( result, result ? message + ": " + QUnit.jsDump.parse(expected) : message + ", expected: " + QUnit.jsDump.parse(expected) + " result: " + QUnit.jsDump.parse(actual) );
}
function synchronize( callback ) {
@@ -1060,9 +1060,9 @@ QUnit.jsDump = (function() {
name:'name',
'class':'className'
},
- HTML:true,//if true, entities are escaped ( <, >, \t, space and \n )
+ 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.
+ multiline:false //if true, items in a collection, are separated by a \n, else just a space.
};
return jsDump;