aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2012-04-30 14:57:00 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2012-04-30 14:58:03 +0200
commitf9e61eb61799faad3b215ed766f51bf79ef9b69f (patch)
tree596626cb105c7f425ff083d87f9ee82ba167118b
parentfc3fc6ec2e9d8cf245c67e90668c1b1ee83f6d24 (diff)
downloadjquery-ui-f9e61eb61799faad3b215ed766f51bf79ef9b69f.tar.gz
jquery-ui-f9e61eb61799faad3b215ed766f51bf79ef9b69f.zip
Fully revert breaking changes to core unit tests markup (htmllint ignores it now anyway).
Also update grunt.js: Simplify default task to finish that faster (also less console spam), remove beta from testswarm browserset, we don't need to test IE10 yet.
-rw-r--r--grunt.js6
-rw-r--r--tests/unit/core/core.html2
2 files changed, 4 insertions, 4 deletions
diff --git a/grunt.js b/grunt.js
index a19e35f5f..7e13bec4a 100644
--- a/grunt.js
+++ b/grunt.js
@@ -370,7 +370,7 @@ grunt.registerTask( "testswarm", function( commit, authToken ) {
}
testswarm({
url: "http://swarm.jquery.org/",
- pollInterval: 5000,
+ pollInterval: 10000,
done: this.async()
}, {
authUsername: "jqueryui",
@@ -379,7 +379,7 @@ grunt.registerTask( "testswarm", function( commit, authToken ) {
runMax: 4,
"runNames[]": Object.keys(tests),
"runUrls[]": testUrls,
- "browserSets[]": ["popular", "beta"]
+ "browserSets[]": ["popular"]
});
});
@@ -566,7 +566,7 @@ grunt.registerTask( "clean", function() {
require( "rimraf" ).sync( "dist" );
});
-grunt.registerTask( "default", "lint csslint htmllint qunit build compare_size" );
+grunt.registerTask( "default", "lint csslint htmllint qunit" );
grunt.registerTask( "sizer", "concat:ui min:dist/jquery-ui.min.js compare_size:all" );
grunt.registerTask( "sizer_all", "concat:ui min compare_size" );
grunt.registerTask( "build", "concat min cssmin" );
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 91595f4e1..e259f3270 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -61,7 +61,7 @@
<option>option</option>
</select>
<textarea id="visibleAncestor-textarea">x</textarea>
- <object id="visibleAncestor-object" codebase="about:blank" data="about:blank" type="text/html">xxx</object>
+ <object id="visibleAncestor-object" codebase="about:blank">xxx</object>
<a href="#" id="visibleAncestor-anchorWithHref">anchor</a>
<a id="visibleAncestor-anchorWithoutHref">anchor</a>
<span id="visibleAncestor-span">x</span>