Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed test cases and class prefix bug #16

Merged
merged 2 commits into from
Nov 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ module.exports = function (modernizrPath) {
"feature-detects": tests,
"options": options,
"minify": minify,
"dest": settings.dest
"dest": settings.dest,
"classPrefix" : settings.classPrefix
};

// Perform a series of checks to validify cache
Expand Down
2 changes: 1 addition & 1 deletion src/crawler.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module.exports = function (modernizrPath) {
}
// If it's not JS, assume it's CSS (or similar, e.g.: LESS, SCSS) files
else {
prefix = settings.cssprefix || '';
prefix = settings.classPrefix || '';
// When no prefix, match usage such as: .classname --or-- .no-classname
// When prefix set, match usage such as: .<prefix>classname --or-- .<prefix>no-classname
regExp = new RegExp("(?:\\." + prefix + ")(?:no-)?(" + type + ")(?![\\w-])", "gm");
Expand Down
1 change: 1 addition & 0 deletions src/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"excludeTests": [],
"crawl" : true,
"useBuffers": false,
"classPrefix" : "",
"files" : {
"src": [
"*[^(g|G)runt(file)?].{js,css,scss}",
Expand Down
11 changes: 6 additions & 5 deletions test/css/vanilla.css
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,12 @@
.peerconnection,
.no-websocketsbinary,
.framed,
.no-blobworkers,
.dataworkers,
.no-sharedworkers,
.transferables,
.no-webworkers {
.no-matchmedia,
.blobworkers,
.no-dataworkers,
.sharedworkers,
.no-transferables,
.webworkers {
background: red;
}

Expand Down
7 changes: 3 additions & 4 deletions test/js/amd.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ define(["Modernizr"], function (M) {
"lowbattery": M.lowbattery
},
"canvas": {
"blending": [
M["canvasblending"]
],
"blending": M.canvasblending,
"todataurl": [
M["todataurljpeg"],
M["todataurlpng"],
Expand Down Expand Up @@ -333,7 +331,8 @@ define(["Modernizr"], function (M) {
"binary": M.websocketsbinary
},
"window": {
"framed": M.framed
"framed": M.framed,
"matchmedia": M.matchmedia
},
"workers": {
"blobworkers": M.blobworkers,
Expand Down
7 changes: 3 additions & 4 deletions test/js/vanilla.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ var tests = {
"lowbattery": Modernizr.lowbattery
},
"canvas": {
"blending": [
Modernizr["canvasblending"]
],
"blending": Modernizr.canvasblending,
"todataurl": [
Modernizr["todataurljpeg"],
Modernizr["todataurlpng"],
Expand Down Expand Up @@ -332,7 +330,8 @@ var tests = {
"binary": Modernizr.websocketsbinary
},
"window": {
"framed": Modernizr.framed
"framed": Modernizr.framed,
"matchmedia": Modernizr.matchmedia
},
"workers": {
"blobworkers": Modernizr.blobworkers,
Expand Down
2 changes: 1 addition & 1 deletion test/settings/prefixed.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"cssprefix": "prefixed-",
"classPrefix": "prefixed-",
"dest": "build/modernizr-prefixed.js",
"uglify": false,
"files": {
Expand Down
2 changes: 1 addition & 1 deletion test/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var cwd = process.cwd();
var expect = require("expect.js");
var nexpect = require("nexpect");

var tests = "adownload, ambientlight, animation, apng, appearance, applicationcache, audio, audioloop, audiopreload, backgroundblendmode, backgroundcliptext, backgroundsize, batteryapi, beacon, bgpositionshorthand, bgpositionxy, bgrepeatround, bgrepeatspace, bgsizecover, blobconstructor, bloburls, blobworkers, borderimage, borderradius, boxshadow, boxsizing, canvas, canvasblending, canvastext, canvaswinding, capture, checked, classlist, contains, contenteditable, contextmenu, cookies, cors, createelement-attrs, createelementattrs, cssall, cssanimations, csscalc, csschunit, csscolumns, cssescape, cssexunit, cssfilters, cssgradients, csshyphens, cssinvalid, cssmask, csspointerevents, csspositionsticky, csspseudoanimations, csspseudotransitions, cssreflections, cssremunit, cssresize, cssscrollbar, csstransforms, csstransforms3d, csstransitions, cssvalid, cssvhunit, cssvmaxunit, cssvminunit, cssvwunit, cubicbezierrange, customevent, customprotocolhandler, dart, datachannel, datalistelem, dataset, datauri, dataview, dataworkers, details, devicemotion, deviceorientation, directory, display-runin, displaytable, documentfragment, draganddrop, ellipsis, emoji, es5, es5array, es5date, es5function, es5object, es5string, es5syntax, es5undefined, es6array, es6math, es6number, es6object, es6string, eventlistener, eventsource, exiforientation, fileinput, filereader, filesystem, flash, flexbox, flexboxlegacy, flexboxtweener, flexwrap, fontface, formattribute, formvalidation, framed, fullscreen, gamepads, generatedcontent, generators, geolocation, getrandomvalues, getusermedia, hashchange, hidden, hiddenscroll, history, hsla, htmlimports, ie8compat, indexeddb, indexeddbblob, inlinesvg, input, inputformaction, inputformenctype, inputformmethod, inputformtarget, inputtypes, intl, jpegxr, json, lastchild, localizednumber, localstorage, lowbandwidth, lowbattery, mathml, mediaqueries, meter, microdata, multiplebgs, mutationobserver, notification, nthchild, objectfit, olreversed, oninput, opacity, outputelem, overflowscrolling, pagevisibility, peerconnection, performance, picture, placeholder, pointerevents, pointerlock, postmessage, preserve3d, progressbar, promises, proximity, queryselector, quotamanagement, regions, requestanimationframe, requestautocomplete, rgba, ruby, sandbox, scriptasync, scriptdefer, seamless, search, serviceworker, sessionstorage, shapes, sharedworkers, siblinggeneral, sizes, smil, softhyphens, softhyphensfind, speechrecognition, speechsynthesis, srcdoc, srcset, strictmode, stylescoped, subpixelfont, supports, svg, svgasimg, svgclippaths, svgfilters, svgforeignobject, target, template, templatestrings, textalignlast, textareamaxlength, textshadow, texttrackapi, time, todataurljpeg, todataurlpng, todataurlwebp, touchevents, track, transferables, typedarrays, unicode, unicoderange, unknownelements, urlparser, userdata, userselect, vibrate, video, videoautoplay, videoloop, videopreload, vml, webaudio, webgl, webglextensions, webintents, webp, webp-lossless, webpalpha, webpanimation, webplossless, websockets, websocketsbinary, websqldatabase, webworkers, willchange, wrapflow, xhr2, xhrresponsetype, xhrresponsetypearraybuffer, xhrresponsetypeblob, xhrresponsetypedocument, xhrresponsetypejson, xhrresponsetypetext";
var tests = "adownload, ambientlight, animation, apng, appearance, applicationcache, audio, audioloop, audiopreload, backgroundblendmode, backgroundcliptext, backgroundsize, batteryapi, beacon, bgpositionshorthand, bgpositionxy, bgrepeatround, bgrepeatspace, bgsizecover, blobconstructor, bloburls, blobworkers, borderimage, borderradius, boxshadow, boxsizing, canvas, canvasblending, canvastext, canvaswinding, capture, checked, classlist, contains, contenteditable, contextmenu, cookies, cors, createelement-attrs, createelementattrs, cssall, cssanimations, csscalc, csschunit, csscolumns, cssescape, cssexunit, cssfilters, cssgradients, csshyphens, cssinvalid, cssmask, csspointerevents, csspositionsticky, csspseudoanimations, csspseudotransitions, cssreflections, cssremunit, cssresize, cssscrollbar, csstransforms, csstransforms3d, csstransitions, cssvalid, cssvhunit, cssvmaxunit, cssvminunit, cssvwunit, cubicbezierrange, customevent, customprotocolhandler, dart, datachannel, datalistelem, dataset, datauri, dataview, dataworkers, details, devicemotion, deviceorientation, directory, display-runin, displaytable, documentfragment, draganddrop, ellipsis, emoji, es5, es5array, es5date, es5function, es5object, es5string, es5syntax, es5undefined, es6array, es6math, es6number, es6object, es6string, eventlistener, eventsource, exiforientation, fileinput, filereader, filesystem, flash, flexbox, flexboxlegacy, flexboxtweener, flexwrap, fontface, formattribute, formvalidation, framed, fullscreen, gamepads, generatedcontent, generators, geolocation, getrandomvalues, getusermedia, hashchange, hidden, hiddenscroll, history, hsla, htmlimports, ie8compat, indexeddb, indexeddbblob, inlinesvg, input, inputformaction, inputformenctype, inputformmethod, inputformtarget, inputtypes, intl, jpegxr, json, lastchild, localizednumber, localstorage, lowbandwidth, lowbattery, matchmedia, mathml, mediaqueries, meter, microdata, multiplebgs, mutationobserver, notification, nthchild, objectfit, olreversed, oninput, opacity, outputelem, overflowscrolling, pagevisibility, peerconnection, performance, picture, placeholder, pointerevents, pointerlock, postmessage, preserve3d, progressbar, promises, proximity, queryselector, quotamanagement, regions, requestanimationframe, requestautocomplete, rgba, ruby, sandbox, scriptasync, scriptdefer, seamless, search, serviceworker, sessionstorage, shapes, sharedworkers, siblinggeneral, sizes, smil, softhyphens, softhyphensfind, speechrecognition, speechsynthesis, srcdoc, srcset, strictmode, stylescoped, subpixelfont, supports, svg, svgasimg, svgclippaths, svgfilters, svgforeignobject, target, template, templatestrings, textalignlast, textareamaxlength, textshadow, texttrackapi, time, todataurljpeg, todataurlpng, todataurlwebp, touchevents, track, transferables, typedarrays, unicode, unicoderange, unknownelements, urlparser, userdata, userselect, vibrate, video, videoautoplay, videoloop, videopreload, vml, webaudio, webgl, webglextensions, webintents, webp, webp-lossless, webpalpha, webpanimation, webplossless, websockets, websocketsbinary, websqldatabase, webworkers, willchange, wrapflow, xhr2, xhrresponsetype, xhrresponsetypearraybuffer, xhrresponsetypeblob, xhrresponsetypedocument, xhrresponsetypejson, xhrresponsetypetext";
var testArray = tests.split(", ");

var cli = path.join(cwd, "bin", "customizr");
Expand Down