test: make sure snapshot works on multiple git versions

lint-staged · Aug 24, 2020 · 7a5182b · 7a5182b
1 parent c7923ad
commit 7a5182b
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/test/integration.test.js b/test/integration.test.js
@@ -489,13 +489,10 @@ describe('lint-staged', () => {
 
     // Nothing is wrong, so a new commit is created and file is pretty
     expect(await execGit(['rev-list', '--count', 'HEAD'])).toEqual('4')
-    expect(await execGit(['log', '-1', '--pretty=%B'])).toMatchInlineSnapshot(`
-      "Merge branch 'branch-b' into master
-
-      # Conflicts:
-      #	test.js
-      "
-    `)
+    const log = await execGit(['log', '-1', '--pretty=%B'])
+    expect(log).toMatch(`Merge branch 'branch-b`)
+    expect(log).toMatch(`Conflicts:`)
+    expect(log).toMatch(`test.js`)
     expect(await readFile('test.js')).toEqual(fileInBranchBFixed)
   })