From ea91c01cc9638538f6861fe0bbe23abfde0b2417 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 22 Dec 2022 14:54:08 +0100
Subject: [PATCH] cli: fix merge conflicts in Lockfile tests

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/cli/src/lib/versioning/Lockfile.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/lib/versioning/Lockfile.test.ts b/packages/cli/src/lib/versioning/Lockfile.test.ts
index a60b71be85..0275c5ee50 100644
--- a/packages/cli/src/lib/versioning/Lockfile.test.ts
+++ b/packages/cli/src/lib/versioning/Lockfile.test.ts
@@ -195,7 +195,7 @@ b@^2:
   version: 2.0.1
 `;
 
-const mockANewLocal = `${newHeader}
+const mockANewLocal = `${MODERN_HEADER}
 a@^1:
   version: 1.0.1
   dependencies:
@@ -210,7 +210,7 @@ b@^2:
   version: 2.0.0
 `;
 
-const mockANewLocalDedup = `${newHeader}
+const mockANewLocalDedup = `${MODERN_HEADER}
 a@^1:
   version: 1.0.1
   dependencies:
@@ -314,7 +314,7 @@ describe('New Lockfile', () => {
     await expect(fs.readFile('/yarn.lock', 'utf8')).resolves.toBe(
       mockANewLocal,
     );
-    await expect(lockfile.save()).resolves.toBeUndefined();
+    await expect(lockfile.save('/yarn.lock')).resolves.toBeUndefined();
     await expect(fs.readFile('/yarn.lock', 'utf8')).resolves.toBe(
       mockANewLocalDedup,
     );