From e02755c70118b5dc059592d209d6665f97084950 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Sat, 6 Feb 2016 21:56:47 -0500 Subject: [PATCH] Improve patch pretty-printing --- js/src/patch.js | 6 +++--- js/test/test-mux.js | 6 +++--- js/test/test-patch.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/js/src/patch.js b/js/src/patch.js index c031f0c..93ed59f 100644 --- a/js/src/patch.js +++ b/js/src/patch.js @@ -229,9 +229,9 @@ Patch.prototype.projectObjects = function (compiledProjection) { }; Patch.prototype.pretty = function () { - return ("<<<<<<<< Removed:\n" + Route.prettyTrie(this.removed) + - "======== Added:\n" + Route.prettyTrie(this.added) + - ">>>>>>>>\n"); + return ("<<<<<<<< Removed:\n" + Route.prettyTrie(this.removed) + "\n" + + "======== Added:\n" + Route.prettyTrie(this.added) + "\n" + + ">>>>>>>>"); } /////////////////////////////////////////////////////////////////////////// diff --git a/js/test/test-mux.js b/js/test/test-mux.js index 416258f..88d6c03 100644 --- a/js/test/test-mux.js +++ b/js/test/test-mux.js @@ -16,9 +16,9 @@ function checkPrettyTrie(m, expected) { function checkPrettyPatch(p, expectedAdded, expectedRemoved) { expect(p.pretty()).to.equal( - ('<<<<<<<< Removed:\n' + expectedRemoved.join('\n') + - '======== Added:\n' + expectedAdded.join('\n') + - '>>>>>>>>\n')); + ('<<<<<<<< Removed:\n' + expectedRemoved.join('\n') + '\n' + + '======== Added:\n' + expectedAdded.join('\n') + '\n' + + '>>>>>>>>')); } function getM() { diff --git a/js/test/test-patch.js b/js/test/test-patch.js index ff4722e..e622487 100644 --- a/js/test/test-patch.js +++ b/js/test/test-patch.js @@ -11,9 +11,9 @@ var _$ = Route._$; function checkPrettyPatch(p, expectedAdded, expectedRemoved) { expect(p.pretty()).to.equal( - ('<<<<<<<< Removed:\n' + expectedRemoved.join('\n') + - '======== Added:\n' + expectedAdded.join('\n') + - '>>>>>>>>\n')); + ('<<<<<<<< Removed:\n' + expectedRemoved.join('\n') + '\n' + + '======== Added:\n' + expectedAdded.join('\n') + '\n' + + '>>>>>>>>')); } describe('basic patch compilation', function () {