Fix parsing on Windows
Replace windows EOL by Unix EOL
This commit is contained in:
parent
6abfbdb6a8
commit
269a6268c4
2 changed files with 48 additions and 0 deletions
|
|
@ -124,6 +124,7 @@
|
||||||
|
|
||||||
var diffLines =
|
var diffLines =
|
||||||
diffInput.replace(/\\ No newline at end of file/g, '')
|
diffInput.replace(/\\ No newline at end of file/g, '')
|
||||||
|
.replace(/\r\n?/g, '\n')
|
||||||
.split('\n');
|
.split('\n');
|
||||||
|
|
||||||
/* Diff */
|
/* Diff */
|
||||||
|
|
|
||||||
47
test/diff-parser-tests.js
Normal file
47
test/diff-parser-tests.js
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
var assert = require('assert');
|
||||||
|
|
||||||
|
var DiffParser = require('../src/diff-parser.js').DiffParser;
|
||||||
|
|
||||||
|
describe('DiffParser', function() {
|
||||||
|
describe('generateDiffJson', function() {
|
||||||
|
|
||||||
|
it('should parse linux with \n diff', function() {
|
||||||
|
var diff =
|
||||||
|
'diff --git a/sample b/sample\n' +
|
||||||
|
'index 0000001..0ddf2ba\n' +
|
||||||
|
'--- a/sample\n' +
|
||||||
|
'+++ b/sample\n' +
|
||||||
|
'@@ -1 +1 @@\n' +
|
||||||
|
'-test\n' +
|
||||||
|
'+test1r\n';
|
||||||
|
var result = Diff2Html.getJsonFromDiff(diff);
|
||||||
|
var file1 = result[0];
|
||||||
|
assert.equal(1, result.length);
|
||||||
|
assert.equal(1, file1.addedLines);
|
||||||
|
assert.equal(1, file1.deletedLines);
|
||||||
|
assert.equal('sample', file1.oldName);
|
||||||
|
assert.equal('sample', file1.newName);
|
||||||
|
assert.equal(1, file1.blocks.length);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should parse windows with \r\n diff', function() {
|
||||||
|
var diff =
|
||||||
|
'diff --git a/sample b/sample\r\n' +
|
||||||
|
'index 0000001..0ddf2ba\r\n' +
|
||||||
|
'--- a/sample\r\n' +
|
||||||
|
'+++ b/sample\r\n' +
|
||||||
|
'@@ -1 +1 @@\r\n' +
|
||||||
|
'-test\r\n' +
|
||||||
|
'+test1r\n';
|
||||||
|
var result = Diff2Html.getJsonFromDiff(diff);
|
||||||
|
var file1 = result[0];
|
||||||
|
assert.equal(1, result.length);
|
||||||
|
assert.equal(1, file1.addedLines);
|
||||||
|
assert.equal(1, file1.deletedLines);
|
||||||
|
assert.equal('sample', file1.oldName);
|
||||||
|
assert.equal('sample', file1.newName);
|
||||||
|
assert.equal(1, file1.blocks.length);
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
});
|
||||||
Loading…
Reference in a new issue