Fix #171 again

Author: abenhamdine

__tests__/main.test.ts

@@ -7,6 +7,7 @@ import { lineNumbers } from './test_compare_1/lineNumbers'
 import { filesAdded, filesModified, filesRemoved } from './test_compare_1/filesChanged'
 
 import { parseTscErrorLine, tscMatcher, parseOutputTsc } from '../src/tscHelpers/parseOutputTsc'
+import { getBodyComment } from '../src/getBodyComment'
 
 test('1. parse tsc error line', () => {
   const line = `src/main.ts(39,11): error TS1155: 'const' declarations must be initialized.`
@@ -87,7 +88,7 @@ test('4. Parsing output', () => {
   expect(parsedErrors[0].extraMsg).toEqual("Type 'LastCnt' is missing the following properties from type 'SelectionPeriaDataCnt': catc_id, src_id")
 })
 
-test('5. compare errors', () => {
+test('5. compare errors test 1', () => {
 
   const resultCompareErrors = compareErrors({
     errorsBefore: errorsBaseBranch as unknown as ErrorTs[],
@@ -100,4 +101,22 @@ test('5. compare errors', () => {
 
   expect(resultCompareErrors.errorsAdded).toHaveLength(15)
 
+  const errorsInModifiedFiles = errorsCurrentBranch.filter(err => {
+    return filesModified.concat(filesAdded).includes(err.fileName)
+  })
+
+  const newErrorsInModifiedFiles = resultCompareErrors.errorsAdded.filter(err => {
+    return filesModified.concat(filesAdded).includes(err.fileName)
+  })
+
+  const comment = getBodyComment({
+    errorsInProjectBefore: errorsBaseBranch,
+    errorsInProjectAfter: errorsCurrentBranch,
+    newErrorsInProject: resultCompareErrors.errorsAdded,
+    errorsInModifiedFiles,
+    newErrorsInModifiedFiles
+  })
+
+  expect(comment).toMatch(/\*\*15 new errors added\*\*/)
+
 })

__tests__/test_compare_2.test.ts

@@ -0,0 +1,21 @@
+import { compareErrors } from '../src/compareErrors'
+import { ErrorTs } from '../src/main'
+import { errorsCurrentBranch } from './test_compare_2/errorsCurrentBranch'
+import { errorsBaseBranch } from './test_compare_2/erreursBaseBranch'
+import { lineNumbers } from './test_compare_2/lineNumbers'
+import { filesAdded, filesModified, filesRemoved } from './test_compare_2/filesChanged'
+
+test.skip('1. compare errors test 2', () => {
+
+    const resultCompareErrors = compareErrors({
+        errorsBefore: errorsBaseBranch as unknown as ErrorTs[],
+        errorsAfter: errorsCurrentBranch as unknown as ErrorTs[],
+        filesChanged: filesModified.split(' '),
+        filesAdded: filesAdded.split(' '),
+        filesDeleted: filesRemoved.split(' '),
+        lineNumbers: lineNumbers
+    })
+
+    expect(resultCompareErrors.errorsAdded).toHaveLength(2)
+
+})

__tests__/test_compare_2/erreursBaseBranch.js

@@ -0,0 +1,3 @@
+export const filesModified = 'server/api/contrats/services/GetInfosCnt.ts server/payrollEngine/PayrollEngine.ts server/payrollEngine/declaCalc.d.ts server/payrollEngine/selectBulsToRecalculate.ts'
+export const filesAdded = ''
+export const filesRemoved = ''

__tests__/test_compare_2/erreursBaseBranch.ts

@@ -0,0 +1 @@
+export const lineNumbers = [{ "path": "server/api/contrats/services/GetInfosCnt.ts", "added": [177], "removed": [177] }, { "path": "server/payrollEngine/PayrollEngine.ts", "added": [315, 316, 317, 318, 319, 320, 321, 322, 323], "removed": [] }, { "path": "server/payrollEngine/declaCalc.d.ts", "added": [111, 127], "removed": [] }, { "path": "server/payrollEngine/selectBulsToRecalculate.ts", "added": [195, 196, 197, 198, 199, 219, 220, 243, 244, 291, 343, 591, 639, 640, 646, 647, 648], "removed": [195, 196, 197, 198, 218, 219, 242, 634, 640, 641] }]