Merge pull request jsdom#543 from godmar/withhtml5

Support running tests under html5 parser

lib/jsdom/browser/index.js

@@ -346,7 +346,7 @@ exports.createWindow = function(dom, options) {
 * With cache: ~80ms
 */
 var defaultParser = null;
-function getDefaultParser() {
+var getDefaultParser = exports.getDefaultParser = function () {
   if (defaultParser === null) {
     try {
       defaultParser = require('htmlparser');
@@ -363,6 +363,17 @@ function getDefaultParser() {
   return defaultParser;
 }
 
+/**
+ * Export getter/setter of default parser to facilitate testing
+ * with different HTML parsers.
+ */
+exports.setDefaultParser = function (parser) {
+  if (typeof parser == 'object') {
+    defaultParser = parser;
+  } else if (typeof parser == 'string')
+    defaultParser = require(parser);
+}
+
 /**
  * Augments the given DOM by adding browser-specific properties and methods (BOM).
  * Returns the augmented DOM.

package.json

@@ -191,7 +191,8 @@
        "contextify" : "0.1.x"
     },
     "optionalDependencies": {
-       "contextify" : "0.1.x"
+       "contextify" : "0.1.x",
+       "html5"      : ">=0.3.8"
     },
     "devDependencies" : {
       "nodeunit" : ">=0.5.x",

test/runner

@@ -20,6 +20,8 @@ var optimist = require('optimist')
     .describe('t', 'choose the test cases to run. ie: -t jquery')
     .alias('d', 'debug')
     .describe('d', 'run in node\'s interactive debugger mode')
+    .alias('p', 'parser')
+    .describe('p', 'the HTML parser to use (e.g. html5); default is htmlparser')
     .alias('v', 'verbose')
     .describe('v', 'show all tests that are being run');
 
@@ -134,6 +136,12 @@ files.map(function (p) {
   }
 });
 
+if (argv.parser) {
+  var browser = require("../lib/jsdom/browser/index");
+  console.log("Using parser " + argv.parser);
+  browser.setDefaultParser(argv.parser);
+}
+
 nodeunit.runModules(modulesToRun, {
   moduleStart: function (name) {
     currentModule = name.replace('.js', '');