fix(snapshot): normalize EOL for toMatchFileSnapshot (#3164)

vitest-dev · Apr 11, 2023 · df3f2b5 · df3f2b5
1 parent 905ec05
commit df3f2b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/packages/snapshot/src/port/state.ts b/packages/snapshot/src/port/state.ts
@@ -18,6 +18,7 @@ import {
   addExtraLineBreaks,
   getSnapshotData,
   keyToTestName,
+  normalizeNewlines,
   prepareExpected,
   removeExtraLineBreaks,
   saveSnapshotFile,
@@ -244,6 +245,12 @@ export default class SnapshotState {
     if (!rawSnapshot)
       receivedSerialized = addExtraLineBreaks(receivedSerialized)
 
+    if (rawSnapshot) {
+      // normalize EOL when snapshot contains CRLF but received is LF
+      if (rawSnapshot.content && rawSnapshot.content.match(/\r\n/) && !receivedSerialized.match(/\r\n/))
+        rawSnapshot.content = normalizeNewlines(rawSnapshot.content)
+    }
+
     const expected = isInline
       ? inlineSnapshot
       : rawSnapshot

diff --git a/packages/snapshot/src/port/utils.ts b/packages/snapshot/src/port/utils.ts
@@ -135,7 +135,7 @@ export async function ensureDirectoryExists(environment: SnapshotEnvironment, fi
   catch { }
 }
 
-function normalizeNewlines(string: string) {
+export function normalizeNewlines(string: string) {
   return string.replace(/\r\n|\r/g, '\n')
 }