Bug fixes + add html url as additional script options

subbuss · subbuss · commit 3e8c8c20aa73 · 2015-09-14T12:49:39.000-05:00
* Remove baseHref as an additional html configuration option.
  The HTML url can be used instead.

* Minor tweaks + bug fixes.
diff --git a/lib/differ.js b/lib/differ.js
@@ -44,7 +44,7 @@ VisualDiffer.takeScreenShot = function(browser, logger, cb, opts, htmlOpts) {
 
 		page.open(htmlOpts.url, function (status) {
 			if (status !== 'success') {
-				htmlOpts.err = 'Could not open page ' + htmlOpts.baseHref + '. Got result ' + status;
+				htmlOpts.err = 'Could not open page ' + htmlOpts.url + '. Got result ' + status;
 				testCompletion(browser, cb, opts);
 				return;
 			}
diff --git a/lib/differ.utils.js b/lib/differ.utils.js
@@ -66,6 +66,11 @@ var standardOpts = {
 		'boolean': false,
 		'default': 'php',
 	},
+	'url1': {
+		description: 'URL for the first HTML to screenshot (useful when we want to screenshot an arbitrary url/html-file)',
+		'boolean': false,
+		'default': null,
+	},
 	'html1Server': {
 		description: 'What server to fetch HTML1 from? (defaults to wikipedia server)',
 		'boolean': false,
@@ -91,6 +96,11 @@ var standardOpts = {
 		'boolean': false,
 		'default': 'parsoid',
 	},
+	'url2': {
+		description: 'URL for the second HTML to screenshot (useful when we want to screenshot an arbitrary url/html-file)',
+		'boolean': false,
+		'default': null,
+	},
 	'html2Server': {
 		description: 'What server to fetch HTML2 from?',
 		'boolean': false,
@@ -194,6 +204,7 @@ Util.computeOpts = function(argv) {
 	opts.html1 = opts.html1 || {};
 	Util.extendProps(opts.html1, {
 		name: opts.name1,
+		url: opts.url1,
 		postprocessorScript: opts.html1PP,
 		dumpHTML: opts.dumpHTML1,
 		dumpCSS: opts.dumpCSS1
@@ -202,6 +213,7 @@ Util.computeOpts = function(argv) {
 	opts.html2 = opts.html2 || {};
 	Util.extendProps(opts.html2, {
 		name: opts.name2,
+		url: opts.url2,
 		postprocessorScript: opts.html2PP,
 		dumpHTML: opts.dumpHTML2,
 		dumpCSS: opts.dumpCSS2,
@@ -236,9 +248,6 @@ Util.computeOpts = function(argv) {
 	if (!opts.html1.url) {
 		opts.html1.url = opts.html1.server + encodeURIComponent(opts.title);
 	}
-	if (!opts.html1.baseHref) {
-		opts.html1.baseHref = opts.html1.server + opts.title;
-	}
 	if (!opts.html1.hasOwnProperty('injectJQuery')) {
 		opts.html1.injectJQuery = false; // PHP parser output loads jquery
 	}
@@ -248,18 +257,15 @@ Util.computeOpts = function(argv) {
 	if (!opts.html2.screenShot) {
 		opts.html2.screenShot = filePath + '.' + opts.html2.name + '.png';
 	}
-	if (!opts.html1.server) {
+	if (!opts.html2.server) {
 		opts.html2.server = opts.html2Server;
 	}
 	opts.html2.server = opts.html2.server.replace(/\/$/, '') + '/';
 	if (!opts.html2.url) {
 		opts.html2.url = opts.html2.server + opts.wiki + '/' + encodeURIComponent(opts.title);
 	}
-	if (!opts.html2.baseHref) {
-		opts.html2.baseHref = opts.html2.server + opts.wiki + '/' + opts.title;
-	}
-	if (!opts.html1.hasOwnProperty('injectJQuery')) {
-		opts.html1.injectJQuery = true; // Parsoid output does not load jquery
+	if (!opts.html2.hasOwnProperty('injectJQuery')) {
+		opts.html2.injectJQuery = true; // Parsoid output does not load jquery
 	}
 
 	// console.log("OPTS: " + JSON.stringify(opts, null, 2));
diff --git a/lib/dumper.js b/lib/dumper.js
@@ -37,7 +37,7 @@ window.dumpHTML = function(opts) {
 
 	if (opts.dumpHTML) {
 		var header = document.head.innerHTML.replace(/href="\/\//g, 'href="http://');
-		var baseHref = "<base href='" + opts.baseHref + "'>\n";
+		var baseHref = "<base href='" + opts.url + "'>\n";
 		var styles = opts.dumpCSS ? '<script>' + JSON.stringify(output, null, 4) + '</script>\n' : '';
 		return '<!DOCTYPE html>\n<html><head>\n' + baseHref + styles + header + '\n</head>' + document.body.outerHTML;
 	} else {
