aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2012-07-09 18:45:49 -0700
committerJörn Zaefferer <joern.zaefferer@gmail.com>2012-07-11 14:44:23 +0200
commit0a4c3344300d7a753328d5e3b9b978b35a249122 (patch)
treea23eeb63d4e46ff243dbc1791277f825f94451db /tests
parentb2b54790b2f35cfc7562343d43582e39dc57fc39 (diff)
downloadjquery-ui-0a4c3344300d7a753328d5e3b9b978b35a249122.tar.gz
jquery-ui-0a4c3344300d7a753328d5e3b9b978b35a249122.zip
Update to QUnit 1.9.0 and use new urlConfig for custom checkboxes
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/testsuite.js14
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js
index 99694a83e..26f46138a 100644
--- a/tests/unit/testsuite.js
+++ b/tests/unit/testsuite.js
@@ -12,7 +12,12 @@ function includeScript( url ) {
QUnit.config.requireExpects = true;
-QUnit.config.urlConfig.push( "min" );
+QUnit.config.urlConfig.push({
+ id: "min",
+ label: "Minified source",
+ tooltip: "Load minified source files instead of the regular unminified ones."
+});
+
TestHelpers.loadResources = QUnit.urlParams.min ?
function() {
// TODO: proper include with theme images
@@ -28,7 +33,12 @@ TestHelpers.loadResources = QUnit.urlParams.min ?
});
};
-QUnit.config.urlConfig.push( "nojshint" );
+QUnit.config.urlConfig.push({
+ id: "nojshint",
+ label: "Skip JSHint",
+ tooltip: "Skip running JSHint, e.g. within TestSwarm, where Jenkins runs it already"
+});
+
var jshintLoaded = false;
TestHelpers.testJshint = function( module ) {
if ( QUnit.urlParams.nojshint ) {