luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix unit tests

Browse source
This commit is contained in:
Aaron Romel 2019-02-04 17:23:31 -05:00
parent c35ccbc770
commit acb9cf2c2d
4 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/diff-parser.js
View file

@ -63,7 +63,7 @@
} }
if (currentFile.newName) { if (currentFile.newName) {
if (configuration.maxLinesShowing && currentFile.deletedLines + currentFile.addedLines > configuration.maxLinesShowing) { if ((configuration || {}).maxLinesShowing && currentFile.deletedLines + currentFile.addedLines > configuration.maxLinesShowing) {
currentFile.shouldCollapse = true; currentFile.shouldCollapse = true;
} }
files.push(currentFile); files.push(currentFile);

6
test/diff2html-tests.js
View file

@ -79,6 +79,8 @@ var htmlLineExample1 =
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">sample</span>\n' + ' </svg> <span class="d2h-file-name">sample</span>\n' +
' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' + ' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-diff">\n' + ' <div class="d2h-file-diff">\n' +
' <div class="d2h-code-wrapper">\n' + ' <div class="d2h-code-wrapper">\n' +
@ -130,6 +132,8 @@ var htmlSideExample1 =
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">sample</span>\n' + ' </svg> <span class="d2h-file-name">sample</span>\n' +
' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' + ' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-files-diff">\n' + ' <div class="d2h-files-diff">\n' +
' <div class="d2h-file-side-diff">\n' + ' <div class="d2h-file-side-diff">\n' +
@ -318,6 +322,8 @@ describe('Diff2Html', function() {
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">CHANGELOG.md</span>\n' + ' </svg> <span class="d2h-file-name">CHANGELOG.md</span>\n' +
' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' + ' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-diff">\n' + ' <div class="d2h-file-diff">\n' +
' <div class="d2h-code-wrapper">\n' + ' <div class="d2h-code-wrapper">\n' +

12
test/line-by-line-tests.js
View file

@ -156,6 +156,8 @@ describe('LineByLinePrinter', function() {
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">my/file/name.js</span>\n' + ' </svg> <span class="d2h-file-name">my/file/name.js</span>\n' +
' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' + ' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-diff">\n' + ' <div class="d2h-file-diff">\n' +
' <div class="d2h-code-wrapper">\n' + ' <div class="d2h-code-wrapper">\n' +
@ -193,6 +195,8 @@ describe('LineByLinePrinter', function() {
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">my/file/name.js</span>\n' + ' </svg> <span class="d2h-file-name">my/file/name.js</span>\n' +
' <span class="d2h-tag d2h-added d2h-added-tag">ADDED</span></span>\n' + ' <span class="d2h-tag d2h-added d2h-added-tag">ADDED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-diff">\n' + ' <div class="d2h-file-diff">\n' +
' <div class="d2h-code-wrapper">\n' + ' <div class="d2h-code-wrapper">\n' +
@ -230,6 +234,8 @@ describe('LineByLinePrinter', function() {
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">my/file/name.js</span>\n' + ' </svg> <span class="d2h-file-name">my/file/name.js</span>\n' +
' <span class="d2h-tag d2h-deleted d2h-deleted-tag">DELETED</span></span>\n' + ' <span class="d2h-tag d2h-deleted d2h-deleted-tag">DELETED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-diff">\n' + ' <div class="d2h-file-diff">\n' +
' <div class="d2h-code-wrapper">\n' + ' <div class="d2h-code-wrapper">\n' +
@ -267,6 +273,8 @@ describe('LineByLinePrinter', function() {
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">my/file/{name1.js → name2.js}</span>\n' + ' </svg> <span class="d2h-file-name">my/file/{name1.js → name2.js}</span>\n' +
' <span class="d2h-tag d2h-moved d2h-moved-tag">RENAMED</span></span>\n' + ' <span class="d2h-tag d2h-moved d2h-moved-tag">RENAMED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-diff">\n' + ' <div class="d2h-file-diff">\n' +
' <div class="d2h-code-wrapper">\n' + ' <div class="d2h-code-wrapper">\n' +
@ -345,6 +353,8 @@ describe('LineByLinePrinter', function() {
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">sample</span>\n' + ' </svg> <span class="d2h-file-name">sample</span>\n' +
' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' + ' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-diff">\n' + ' <div class="d2h-file-diff">\n' +
' <div class="d2h-code-wrapper">\n' + ' <div class="d2h-code-wrapper">\n' +
@ -410,6 +420,8 @@ describe('LineByLinePrinter', function() {
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">sample</span>\n' + ' </svg> <span class="d2h-file-name">sample</span>\n' +
' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' + ' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-file-diff">\n' + ' <div class="d2h-file-diff">\n' +
' <div class="d2h-code-wrapper">\n' + ' <div class="d2h-code-wrapper">\n' +

4
test/side-by-side-printer-tests.js
View file

@ -241,6 +241,8 @@ describe('SideBySidePrinter', function() {
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">sample</span>\n' + ' </svg> <span class="d2h-file-name">sample</span>\n' +
' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' + ' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-files-diff">\n' + ' <div class="d2h-files-diff">\n' +
' <div class="d2h-file-side-diff">\n' + ' <div class="d2h-file-side-diff">\n' +
@ -317,6 +319,8 @@ describe('SideBySidePrinter', function() {
' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' + ' <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
' </svg> <span class="d2h-file-name">sample</span>\n' + ' </svg> <span class="d2h-file-name">sample</span>\n' +
' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' + ' <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
' <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
' <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
' </div>\n' + ' </div>\n' +
' <div class="d2h-files-diff">\n' + ' <div class="d2h-files-diff">\n' +
' <div class="d2h-file-side-diff">\n' + ' <div class="d2h-file-side-diff">\n' +