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

Merge branch 'winh-jest-no-identical-title' into 'master'

Browse source 
Enable ESLint rule jest/no-identical-title

See merge request gitlab-org/gitlab-ce!27139
This commit is contained in:
Clement Ho 2019-04-09 14:39:31 +00:00
commit 67c3308412
2 changed files with 43 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
spec/frontend/.eslintrc.yml
View file

@ -13,5 +13,6 @@ globals:
preloadFixtures: false
setFixtures: false
rules:
jest/no-identical-title: error
jest/no-focused-tests: error
jest/no-jasmine-globals: error

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

@ -9,60 +9,57 @@ describe('Multi-file editor library diff calculator', () => {
});
describe('modified', () => {
it('', () => {
const diff = computeDiff('123', '1234')[0];
it.each`
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.modified).toBeTruthy();
expect(diff.removed).toBeUndefined();
});
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);
});
expect(diff.lineNumber).toBe(lineNumber);
},
);
});
describe('added', () => {
it('', () => {
const diff = computeDiff('123', '123\n123')[0];
it.each`
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.modified).toBeUndefined();
expect(diff.removed).toBeUndefined();
});
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);
});
expect(diff.lineNumber).toBe(lineNumber);
},
);
});
describe('removed', () => {
it('', () => {
const diff = computeDiff('123', '')[0];
it.each`
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.modified).toBeUndefined();
expect(diff.modified).toBe(modified);
expect(diff.removed).toBeTruthy();
});
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);
});
expect(diff.lineNumber).toBe(lineNumber);
},
);
});
it('includes line number of change', () => {