Skip to content

Commit 7af5a25

Browse files
committed
Fix #166
1 parent 3aabe37 commit 7af5a25

26 files changed

+8044
-102
lines changed

__tests__/main.test.ts

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import { compareErrors, FileWithLineNumbers } from '../src/compareErrors'
22
import { ErrorTs } from '../src/main'
3-
3+
import { outputBaseBranch } from './test_compare_1/outputBaseBranch'
4+
import { errorsCurrentBranch } from './test_compare_1/errorsCurrentBranch'
5+
import { errorsBaseBranch } from './test_compare_1/erreursBaseBranch'
6+
import { lineNumbers } from './test_compare_1/lineNumbers'
7+
import { filesAdded, filesModified, filesRemoved } from './test_compare_1/filesChanged'
48

59
import { parseTscErrorLine, tscMatcher, parseOutputTsc } from '../src/tscHelpers/parseOutputTsc'
610

@@ -33,25 +37,25 @@ test('3. compareErrors', () => {
3337

3438
const errorsBefore: ErrorTs[] = [{
3539
message: 'test',
36-
line: 3,
37-
column: 20,
38-
code: 60312,
40+
line: '3',
41+
column: '20',
42+
code: '60312',
3943
fileName: 'src/fakeErrors.ts',
4044
fileNameResolved: 'src/fakeErrors.ts'
4145
}]
4246

4347
const errorsAfter: ErrorTs[] = [{
4448
message: 'test',
45-
line: 3,
46-
column: 20,
47-
code: 60312,
49+
line: '3',
50+
column: '20',
51+
code: '60312',
4852
fileName: 'src/fakeErrors.ts',
4953
fileNameResolved: 'src/fakeErrors.ts'
5054
}, {
5155
message: 'test2',
52-
line: 10,
53-
column: 20,
54-
code: 60312,
56+
line: '10',
57+
column: '20',
58+
code: '60312',
5559
fileName: 'src/fakeErrors.ts',
5660
fileNameResolved: 'src/fakeErrors.ts'
5761
}]
@@ -76,3 +80,24 @@ test('3. compareErrors', () => {
7680

7781
})
7882

83+
test('4. Parsing output', () => {
84+
const parsedErrors = parseOutputTsc(outputBaseBranch)
85+
expect(parsedErrors).toHaveLength(1252)
86+
expect(parsedErrors[0]).toHaveProperty('extraMsg')
87+
expect(parsedErrors[0].extraMsg).toEqual("Type 'LastCnt' is missing the following properties from type 'SelectionPeriaDataCnt': catc_id, src_id")
88+
})
89+
90+
test('5. compare errors', () => {
91+
92+
const resultCompareErrors = compareErrors({
93+
errorsBefore: errorsBaseBranch as unknown as ErrorTs[],
94+
errorsAfter: errorsCurrentBranch as unknown as ErrorTs[],
95+
filesChanged: filesModified.split(' '),
96+
filesAdded: filesAdded.split(' '),
97+
filesDeleted: filesRemoved.split(' '),
98+
lineNumbers: lineNumbers
99+
})
100+
101+
expect(resultCompareErrors.errorsAdded).toHaveLength(15)
102+
103+
})

__tests__/resultCompareErrors.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

__tests__/test_compare_1/erreursBaseBranch.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

__tests__/test_compare_1/erreursBaseBranch.ts

Lines changed: 2 additions & 0 deletions
Large diffs are not rendered by default.
File renamed without changes.

__tests__/test_compare_1/errorsCurrentBranch.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

__tests__/test_compare_1/errorsCurrentBranch.ts

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

__tests__/test_compare_1/filesChanged.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export const filesModified = 'server/constants.ts server/reports/canUserGenerateReport.ts server/reports/data/getDataShared.ts server/reports/data/shared/generateCritDesc.ts server/reports/data/shared/getTitres.ts server/reports/data/shared/groupOnColNo.ts server/reports/data/shared/shared.d.ts server/reports/dataReportsMgr.ts server/reports/handlebars/handlebarsHelpers.spec.ts server/reports/handlebars/handlebarsHelpers.ts server/reports/objectToTemplateArray.ts server/reports/reportsConfigs.ts server/reports/templateMgr.ts'
2+
export const filesAdded = 'server/reports/data/getDataVarsSaisRubs.ts server/reports/data/templateConfigs/configVarsSaisRubs.ts'
3+
export const filesRemoved = ''

__tests__/test_compare_1/lineNumbers.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)