wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 19:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use word diff if --color is enabled

Browse source 
Change-Id: Ib8d3de75ac306974abfdaca22bfc7b69bc62891d
This commit is contained in:
Gabriel Wicke 2012-06-05 16:10:13 +02:00
parent d16032ae9a
commit 0f9d939b00
1 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
tests/parser/parserTests.js
View file

@ -418,6 +418,39 @@ ParserTests.prototype.processResult = function ( index, item, doc ) {
process.nextTick( this.processCase.bind( this, index + 1 ) );
};
ParserTests.prototype.diff = function ( a, b ) {
if ( this.argv.color ) {
return jsDiff.diffWords( a, b ).map( function ( change ) {
if ( change.added ) {
return change.value.green;
} else if ( change.removed ) {
return change.value.red;
} else {
return change.value;
}
}).join('');
} else {
var patch = jsDiff.createPatch('wikitext.txt', a, b, 'before', 'after');
console.log('DIFF'.cyan +': ');
// Strip the header from the patch, we know how diffs work..
patch = patch.replace(/^[^\n]*\n[^\n]*\n[^\n]*\n[^\n]*\n/, '');
return patch.split( '\n' ).map( function(line) {
// Add some colors to diff output
switch( line.charAt(0) ) {
case '-':
return line.red;
case '+':
return line.blue;
default:
return line;
}
}).join( "\n" );
}
}
ParserTests.prototype.checkResult = function ( item, out ) {
var normalizedOut = this.normalizeOut(out);
var normalizedExpected = this.normalizeHTML(item.result);
@ -450,26 +483,10 @@ ParserTests.prototype.checkResult = function ( item, out ) {
console.log('NORMALIZED RENDERED'.magenta + ':');
console.log(this.formatHTML(this.normalizeOut(out)) + "\n");
var patch = jsDiff.createPatch('wikitext.txt', a, b, 'before', 'after');
console.log('DIFF'.cyan +': ');
// Strip the header from the patch, we know how diffs work..
patch = patch.replace(/^[^\n]*\n[^\n]*\n[^\n]*\n[^\n]*\n/, '');
var colored_diff = patch.split( '\n' ).map( function(line) {
// Add some colors to diff output
switch( line.charAt(0) ) {
case '-':
return line.red;
case '+':
return line.blue;
default:
return line;
}
}).join( "\n" );
var colored_diff = this.diff( a, b );
console.log( colored_diff );
if(this.argv.printwhitelist) {
@ -507,26 +524,8 @@ ParserTests.prototype.checkRoundTripResult = function ( item, out ) {
console.log('NORMALIZED RENDERED'.magenta + ':');
console.log(normalizedOut + "\n");
var patch = jsDiff.createPatch('wikitext.txt', normalizedExpected, normalizedOut, 'before', 'after');
console.log('DIFF'.cyan +': ');
// Strip the header from the patch, we know how diffs work..
patch = patch.replace(/^[^\n]*\n[^\n]*\n[^\n]*\n[^\n]*\n/, '');
var colored_diff = patch.split( '\n' ).map( function(line) {
// Add some colors to diff output
switch( line.charAt(0) ) {
case '-':
return line.red;
case '+':
return line.blue;
default:
return line;
}
}).join( "\n" );
var colored_diff = this.diff ( normalizedExpected, normalizedOut );
console.log( colored_diff );
}
} else {