kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Refactor diff_spec.js to use table-based tests

Browse source
This commit is contained in:
Winnie Hellmann 2019-04-08 19:54:15 +02:00
parent 61d08f575c
commit f23737a498
1 changed files with 42 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
spec/frontend/ide/lib/diff/diff_spec.js
View file

@ -9,60 +9,57 @@ describe('Multi-file editor library diff calculator', () => {
}); });
describe('modified', () => { describe('modified', () => {
it('', () => { it.each`
const diff = computeDiff('123', '1234')[0]; originalContent | newContent | lineNumber
${'123'} | ${'1234'} | ${1}
${'123\n123\n123'} | ${'123\n1234\n123'} | ${2}
`(
'marks line $lineNumber as added and modified but not removed',
({ originalContent, newContent, lineNumber }) => {
const diff = computeDiff(originalContent, newContent)[0];
expect(diff.added).toBeTruthy(); expect(diff.added).toBeTruthy();
expect(diff.modified).toBeTruthy(); expect(diff.modified).toBeTruthy();
expect(diff.removed).toBeUndefined(); expect(diff.removed).toBeUndefined();
}); expect(diff.lineNumber).toBe(lineNumber);
},
it('', () => { );
const diff = computeDiff('123\n123\n123', '123\n1234\n123')[0];
expect(diff.added).toBeTruthy();
expect(diff.modified).toBeTruthy();
expect(diff.removed).toBeUndefined();
expect(diff.lineNumber).toBe(2);
});
}); });
describe('added', () => { describe('added', () => {
it('', () => { it.each`
const diff = computeDiff('123', '123\n123')[0]; originalContent | newContent | lineNumber
${'123'} | ${'123\n123'} | ${1}
${'123\n123\n123'} | ${'123\n123\n1234\n123'} | ${3}
`(
'marks line $lineNumber as added but not modified and not removed',
({ originalContent, newContent, lineNumber }) => {
const diff = computeDiff(originalContent, newContent)[0];
expect(diff.added).toBeTruthy(); expect(diff.added).toBeTruthy();
expect(diff.modified).toBeUndefined(); expect(diff.modified).toBeUndefined();
expect(diff.removed).toBeUndefined(); expect(diff.removed).toBeUndefined();
}); expect(diff.lineNumber).toBe(lineNumber);
},
it('', () => { );
const diff = computeDiff('123\n123\n123', '123\n123\n1234\n123')[0];
expect(diff.added).toBeTruthy();
expect(diff.modified).toBeUndefined();
expect(diff.removed).toBeUndefined();
expect(diff.lineNumber).toBe(3);
});
}); });
describe('removed', () => { describe('removed', () => {
it('', () => { it.each`
const diff = computeDiff('123', '')[0]; originalContent | newContent | lineNumber | modified
${'123'} | ${''} | ${1} | ${undefined}
${'123\n123\n123'} | ${'123\n123'} | ${2} | ${true}
`(
'marks line $lineNumber as removed',
({ originalContent, newContent, lineNumber, modified }) => {
const diff = computeDiff(originalContent, newContent)[0];
expect(diff.added).toBeUndefined(); expect(diff.added).toBeUndefined();
expect(diff.modified).toBeUndefined(); expect(diff.modified).toBe(modified);
expect(diff.removed).toBeTruthy(); expect(diff.removed).toBeTruthy();
}); expect(diff.lineNumber).toBe(lineNumber);
},
it('', () => { );
const diff = computeDiff('123\n123\n123', '123\n123')[0];
expect(diff.added).toBeUndefined();
expect(diff.modified).toBeTruthy();
expect(diff.removed).toBeTruthy();
expect(diff.lineNumber).toBe(2);
});
}); });
it('includes line number of change', () => { it('includes line number of change', () => {