☕️ Classic, reliable, trusted test framework for Node.js and the browser
add unified diff separator (#2846)
olsonpmeaad1e33647e
diff --git a/lib/reporters/base.js b/lib/reporters/base.jsindex aab912e5..2ccfd1f3 100644--- a/lib/reporters/base.js+++ b/lib/reporters/base.js@@ -404,7 +404,7 @@ function unifiedDiff (err, escape) {return indent + colorLines('diff removed', line);}if (line.match(/@@/)) {- return null;+ return '--';}if (line.match(/\\ No newline/)) {return null;@@ -415,7 +415,7 @@ function unifiedDiff (err, escape) {return typeof line !== 'undefined' && line !== null;}var msg = diff.createPatch('string', err.actual, err.expected);- var lines = msg.split('\n').splice(4);+ var lines = msg.split('\n').splice(5);return '\n ' +colorLines('diff added', '+ expected') + ' ' +colorLines('diff removed', '- actual') +diff --git a/test/reporters/base.spec.js b/test/reporters/base.spec.jsindex 54ee8b5e..6c0cc587 100644--- a/test/reporters/base.spec.js+++ b/test/reporters/base.spec.js@@ -14,6 +14,14 @@ function makeTest (err) {};}+function createElements (argObj) {+ var res = [];+ for (var i = argObj.from; i <= argObj.to; i += 1) {+ res.push('element ' + i);+ }+ return res;+}+describe('Base reporter', function () {var stdout;var stdoutWrite;@@ -160,6 +168,46 @@ describe('Base reporter', function () {});});+ describe('unified diff reporter', function () {+ it('should separate diff hunks by two dashes', function () {+ var err = new Error('test');+ var errOut;++ err.actual = createElements({ from: 2, to: 11 });+ err.expected = createElements({ from: 1, to: 10 });+ err.showDiff = true;+ var test = makeTest(err);++ Base.inlineDiffs = false;+ Base.list([test]);++ errOut = stdout.join('\n');++ var regexesToMatch = [+ /\[/,+ /\+ {2}"element 1"/,+ /"element 2"/,+ /"element 3"/,+ /"element 4"/,+ /"element 5"/,+ /--/,+ /"element 7"/,+ /"element 8"/,+ /"element 9"/,+ /"element 10"/,+ /- {2}"element 11"/,+ /]/,+ /test/,+ /expected/,+ /actual/+ ];++ regexesToMatch.forEach(function (aRegex) {+ errOut.should.match(aRegex);+ });+ });+ });+it('should stringify objects', function () {var err = new Error('test');var errOut;