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

Add more eol tests for old os x and mixed eols

Browse source
This commit is contained in:
Rodrigo Fernandes 2016-02-07 12:47:00 +00:00
parent 269a6268c4
commit 93dd322382
1 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
test/diff-parser-tests.js
View file

@ -5,7 +5,7 @@ var DiffParser = require('../src/diff-parser.js').DiffParser;
describe('DiffParser', function() { describe('DiffParser', function() {
describe('generateDiffJson', function() { describe('generateDiffJson', function() {
it('should parse linux with \n diff', function() { it('should parse unix with \n diff', function() {
var diff = var diff =
'diff --git a/sample b/sample\n' + 'diff --git a/sample b/sample\n' +
'index 0000001..0ddf2ba\n' + 'index 0000001..0ddf2ba\n' +
@ -14,14 +14,7 @@ describe('DiffParser', function() {
'@@ -1 +1 @@\n' + '@@ -1 +1 @@\n' +
'-test\n' + '-test\n' +
'+test1r\n'; '+test1r\n';
var result = Diff2Html.getJsonFromDiff(diff); checkDiffSample(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() { it('should parse windows with \r\n diff', function() {
@ -32,7 +25,35 @@ describe('DiffParser', function() {
'+++ b/sample\r\n' + '+++ b/sample\r\n' +
'@@ -1 +1 @@\r\n' + '@@ -1 +1 @@\r\n' +
'-test\r\n' + '-test\r\n' +
'+test1r\r\n';
checkDiffSample(diff)
});
it('should parse old os x with \r diff', function() {
var diff =
'diff --git a/sample b/sample\r' +
'index 0000001..0ddf2ba\r' +
'--- a/sample\r' +
'+++ b/sample\r' +
'@@ -1 +1 @@\r' +
'-test\r' +
'+test1r\r';
checkDiffSample(diff)
});
it('should parse mixed eols diff', function() {
var diff =
'diff --git a/sample b/sample\n' +
'index 0000001..0ddf2ba\r\n' +
'--- a/sample\r' +
'+++ b/sample\r\n' +
'@@ -1 +1 @@\n' +
'-test\r' +
'+test1r\n'; '+test1r\n';
checkDiffSample(diff)
});
function checkDiffSample(diff) {
var result = Diff2Html.getJsonFromDiff(diff); var result = Diff2Html.getJsonFromDiff(diff);
var file1 = result[0]; var file1 = result[0];
assert.equal(1, result.length); assert.equal(1, result.length);
@ -41,7 +62,7 @@ describe('DiffParser', function() {
assert.equal('sample', file1.oldName); assert.equal('sample', file1.oldName);
assert.equal('sample', file1.newName); assert.equal('sample', file1.newName);
assert.equal(1, file1.blocks.length); assert.equal(1, file1.blocks.length);
}); }
}); });
}); });