Skip to content

Commit

Permalink
Build: Increase htmllint coverage by testing all files, ignoring errors
Browse files Browse the repository at this point in the history
Also formats jscsBad array and sorts it alphabetically.

Closes gh-1507
  • Loading branch information
jzaefferer committed Mar 18, 2015
1 parent 62620a3 commit 4e6e27d
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 6 deletions.
40 changes: 35 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,27 @@ var
},
component = grunt.option( "component" ) || "**",

jscsBad = [ "ui/tabs.js", "ui/slider.js", "ui/selectable.js", "ui/resizable.js", "ui/mouse.js", "ui/menu.js", "ui/effect*.js", "ui/droppable.js", "ui/draggable.js", "ui/button.js", "ui/datepicker.js", "ui/sortable.js" ];
jscsBad = [
"ui/button.js",
"ui/datepicker.js",
"ui/draggable.js",
"ui/droppable.js",
"ui/effect*.js",
"ui/menu.js",
"ui/mouse.js",
"ui/resizable.js",
"ui/selectable.js",
"ui/slider.js",
"ui/sortable.js",
"ui/tabs.js"
],

htmllintBad = [
"demos/tabs/ajax/content*.html",
"demos/tooltip/ajax/content*.html",
"tests/unit/core/core.html",
"tests/unit/tabs/data/test.html"
];

function mapMinFile( file ) {
return "dist/" + file.replace( /ui\//, "minified/" );
Expand Down Expand Up @@ -187,10 +207,20 @@ grunt.initConfig({
},
uglify: minify,
htmllint: {
// ignore files that contain invalid html, used only for ajax content testing
all: grunt.file.expand( [ "demos/**/*.html", "tests/**/*.html" ] ).filter(function( file ) {
return !/(?:ajax\/content\d\.html|tabs\/data\/test\.html|tests\/unit\/core\/core.*\.html)/.test( file );
})
good: [ "demos/**/*.html", "tests/**/*.html" ].concat( htmllintBad.map( function( file ) {
return "!" + file;
} ) ),
bad: {
options: {
ignore: [
/Start tag seen without seeing a doctype first/,
/Element “head” is missing a required instance of child element “title”/,
/Element “object” is missing one or more of the following/,
/The “codebase” attribute on the “object” element is obsolete/
]
},
src: htmllintBad
}
},
qunit: {
files: expandFiles( "tests/unit/" + component + "/*.html" ).filter(function( file ) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"grunt-contrib-uglify": "0.1.1",
"grunt-esformatter": "0.2.0",
"grunt-git-authors": "2.0.0",
"grunt-html": "1.0.0",
"grunt-html": "4.0.1",
"grunt-jscs": "1.5.0",
"load-grunt-tasks": "0.3.0",
"rimraf": "2.1.4",
Expand Down

0 comments on commit 4e6e27d

Please sign in to comment.