Merge branch 'master' into faster-string-diff

Author: lukechilds

lib/format-assert-error.js

@@ -1,5 +1,6 @@
 'use strict';
 const indentString = require('indent-string');
+const stripAnsi = require('strip-ansi');
 const chalk = require('chalk');
 const diff = require('diff');
 const DiffMatchPatch = require('diff-match-patch');
@@ -47,7 +48,7 @@ module.exports = err => {
 
 	if (err.actualType === 'string' && err.expectedType === 'string') {
 		const diffMatchPatch = new DiffMatchPatch();
-		const patch = diffMatchPatch.diff_main(err.actual, err.expected);
+		const patch = diffMatchPatch.diff_main(stripAnsi(err.actual), stripAnsi(err.expected));
 		const msg = patch
 			.map(part => {
 				if (part[0] === 1) {
@@ -58,7 +59,7 @@ module.exports = err => {
 					return chalk.bgRed.black(part[1]);
 				}
 
-				return part[1];
+				return chalk.red(part[1]);
 			})
 			.join('');
 

test/format-assert-error.js

@@ -72,7 +72,7 @@ test('diff strings', t => {
 
 	t.is(format(err), [
 		'Difference:\n',
-		`ab${chalk.bgRed.black('c')}${chalk.bgGreen.black('d')}\n`
+		`${chalk.red('ab')}${chalk.bgRed.black('c')}${chalk.bgGreen.black('d')}\n`
 	].join('\n'));
 	t.end();
 });