Update (diffserver + testreduce client config) settings

subbuss · subbuss · commit 9bdbbbdfb7bc · 2015-09-14T12:07:55.000-05:00
* Use the new format and option names.
* Other minor tweaks.
diff --git a/bin/settings.js.example b/bin/settings.js.example
diff --git a/diffserver/diffserver.js b/diffserver/diffserver.js
@@ -89,8 +89,8 @@ app.get(/^\/diff\/([^/]*)\/(.*)/, function(req, res) {
 			page += "<ul>";
 			// Set up relative links.
 			// -- walk 2 levels up (/diff/wikiprefix/) to set up the right urls.
-			page += "<li><a href='../../" + opts.html1.screenShot.replace(baseDir, "pngs") + "'>" + opts.html1.source + " Screenshot</a></li>";
-			page += "<li><a href='../../" + opts.html2.screenShot.replace(baseDir, "pngs") + "'>" + opts.html2.source + " Screenshot</a></li>";
+			page += "<li><a href='../../" + opts.html1.screenShot.replace(baseDir, "pngs") + "'>" + opts.html1.name + " Screenshot</a></li>";
+			page += "<li><a href='../../" + opts.html2.screenShot.replace(baseDir, "pngs") + "'>" + opts.html2.name + " Screenshot</a></li>";
 			page += "<li><a href='../../" + opts.diffFile.replace(baseDir, "pngs") + "'>Visual Diff</a></li>";
 			page += "</ul></body>";
 			page += "</html>";
diff --git a/diffserver/diffserver.settings.js.example b/diffserver/diffserver.settings.js.example
@@ -1,19 +1,36 @@
 "use strict";
 
-if ( typeof module === 'object' ) {
+if (typeof module === 'object') {
 	module.exports = {
-		parsoidServer: "http://localhost:8000",
 		stylesYamlFile: "<full-path-to-visual-diff-repo>/styles.yaml",
 		viewportWidth: 1920,
 		viewportHeight: 1080,
-		dumpParsoidHTML: false,
+
 		wiki: "enwiki",
 		title: "Main_Page",
 		filePrefix: null,
 		quiet: true,
 		outdir: "pngs",
+
+		// HTML1 generator options
+		html1: {
+			name: 'php',
+			dumpHTML: false,
+			postprocessorScript: "../lib/php_parser.postprocess.js",
+			injectJQuery: false,
+		},
+		// HTML2 generator options
+		html2: {
+			name: 'parsoid',
+			server: 'http://localhost:8000',
+			dumpHTML: false,
+			postprocessorScript: "../lib/parsoid.postprocess.js",
+			injectJQuery: true,
+		},
 		// resemblejs options
-		errorType: "movement", // Better error display for making sense of diffs
-		largeImageThreshold: 0 // Cleaner diff without the skipped pixels grid
+		outputSettings: {
+			errorType: "movement", // Better error display for making sense of diffs
+			largeImageThreshold: 0 // Cleaner diff without the skipped pixels grid
+		},
 	};
 }
diff --git a/lib/differ.utils.js b/lib/differ.utils.js
@@ -227,12 +227,12 @@ Util.computeOpts = function(argv) {
 	// These computed properties are hardcoded for PHP parser API urls and output
 	// These are updated only if not already set.
 	if (!opts.html1.screenShot) {
-		opts.html1.screenShot = filePath + '.' + opts.name1 + '.png';
+		opts.html1.screenShot = filePath + '.' + opts.html1.name + '.png';
 	}
 	if (!opts.html1.server) {
 		opts.html1.server = opts.html1Server || wikiBaseUrl[opts.wiki]; // Default to wikipedia server
-		opts.html1.server = opts.html1.server.replace(/\/$/, '') + '/';
 	}
+	opts.html1.server = opts.html1.server.replace(/\/$/, '') + '/';
 	if (!opts.html1.url) {
 		opts.html1.url = opts.html1.server + encodeURIComponent(opts.title);
 	}
@@ -246,11 +246,12 @@ Util.computeOpts = function(argv) {
 	// These computed properties are hardcoded for Parsoid API urls and output
 	// These are updated only if not already set.
 	if (!opts.html2.screenShot) {
-		opts.html2.screenShot = filePath + '.' + opts.name2 + '.png';
+		opts.html2.screenShot = filePath + '.' + opts.html2.name + '.png';
 	}
-	if (!opts.html2.server) {
-		opts.html2.server = opts.html2Server.replace(/\/$/, '') + "/";
+	if (!opts.html1.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);
 	}
diff --git a/lib/parsoid.postprocess.js b/lib/parsoid.postprocess.js
@@ -8,7 +8,7 @@ window.postprocessDOM = function(customCSS) {
 		$('table.collapsible tr').show();
 		$('*.NavContent').show();
 
-		// Fix problem with HTML2 (default: Parsoid) CSS to reduce rendering diffs
+		// Fix problem with Parsoid CSS to reduce rendering diffs
 		$('<style type="text/css">' + customCSS + '</style>').appendTo('head');
 
 		// Work-around for body.mediawiki matches in
diff --git a/lib/php_parser.postprocess.js b/lib/php_parser.postprocess.js
@@ -18,8 +18,7 @@ window.postprocessDOM = function() {
 	$('span.collapseButton').hide();
 	$('a.NavToggle').hide();
 
-	// Finally remove all chrome, only keep the actual
-	// content.
+	// Finally remove all chrome, only keep the actual content.
 	document.body.innerHTML = $('div#mw-content-text').html();
 	document.body.classList.add('mw-body');
 	document.body.classList.add('mw-body-content');
