chore(jest-each): normalize new lines for comments

jestjs · Jul 25, 2019 · 2415560 · 2415560
1 parent 9084bc4
commit 2415560
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/packages/jest-each/src/__tests__/template.test.ts b/packages/jest-each/src/__tests__/template.test.ts
@@ -411,6 +411,29 @@ describe('jest-each', () => {
           ]);
         });
 
+        test('removes comments with windows new line characters "\\r\\n"', () => {
+          const globalTestMocks = getGlobalTestMocks();
+          const eachObject = each.withGlobal(
+            globalTestMocks,
+          )`\r\na    | b    | expected\r\n// ${1} | ${1} | ${0}\r\n${1} | ${1} | ${2}\r\n/* ${1} | ${1} | ${5} */\r\n${2} | ${2} | ${4}\r\n`;
+          const testFunction = get(eachObject, keyPath);
+          testFunction('expected string: a=$a, b=$b, expected=$expected', noop);
+
+          const globalMock = get(globalTestMocks, keyPath);
+          expect(globalMock.mock.calls).toEqual([
+            [
+              'expected string: a=1, b=1, expected=2',
+              expect.any(Function),
+              undefined,
+            ],
+            [
+              'expected string: a=2, b=2, expected=4',
+              expect.any(Function),
+              undefined,
+            ],
+          ]);
+        });
+
         test('removes commented out tests and allow spaces between', () => {
           const globalTestMocks = getGlobalTestMocks();
           const eachObject = each.withGlobal(globalTestMocks)`

diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts
@@ -66,9 +66,10 @@ function filterTemplate(
 ) {
   let multipleLineCommentCount: number = 0;
   let isSingleLineComment: boolean = false;
-  let skipNext: boolean = false;
 
   function removeCommentsFromLine(line: string): string {
+    let skipNext: boolean = false;
+
     const result = line
       .split('')
       .reduce((acc: Array<string>, character, index, array) => {
@@ -137,7 +138,8 @@ function filterTemplate(
     // remove excess space from all lines
     .map(line =>
       line
-        .split('\n')
+        // https://stackoverflow.com/a/52947649
+        .split(/\r\n|\r|\n/)
         .map(subLine => subLine.trim())
         .join('\n'),
     )