test add corepack check

getsentry · Dec 10, 2024 · d4c885d · d4c885d
1 parent 429dbbd
commit d4c885d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/test/scripts/check-siblings.npm10.test.ts b/test/scripts/check-siblings.npm10.test.ts
@@ -17,7 +17,6 @@ describe('NPM 10 tests', () => {
 
       ClearE2ETestFolder(testPath);
       CreateE2EPackage(testPath);
-      InstallSDK('corepack',['prepare', '--activate'], testPath);
 
       expect(GetPackageManagerVersion('npm', testPath)).toBe("10.9.0");
 

diff --git a/test/scripts/check-siblings.yarnv3.test.ts b/test/scripts/check-siblings.yarnv3.test.ts
@@ -25,8 +25,7 @@ describe('Yarn V3 tests', () => {
       ClearE2ETestFolder(testPath);
       CreateE2EPackage(testPath);
       SetupYarnRC(testPath);
-//      InstallSDK('corepack',['prepare', '--activate'], testPath);
-//      expect(GetPackageManagerVersion('yarn', testPath)).toBe("3.8.6");
+      expect(GetPackageManagerVersion('yarn', testPath)).toBe("3.8.6");
 
       const expectedPackageJson = {
         ...GetInitialE2EPackage(testPath),
@@ -46,7 +45,6 @@ describe('Yarn V3 tests', () => {
       expect(result.status).toBe(0);
       expect(packageJson).toEqual(expectedPackageJson);
       expect(e2eLogs).toContain('E2E_TEST: OK');
-      expect(GetPackageManagerVersion('yarn', testPath)).toBe("3.8.6");
     });
 
     test('warns when incorrect sibling is installed', async () => {
@@ -59,8 +57,7 @@ describe('Yarn V3 tests', () => {
       ClearE2ETestFolder(testPath);
       CreateE2EPackage(testPath);
       SetupYarnRC(testPath);
-//      InstallSDK('corepack',['prepare', '--activate'], testPath);
-//      expect(GetPackageManagerVersion('yarn',testPath)).toBe("3.8.6");
+      expect(GetPackageManagerVersion('yarn',testPath)).toBe("3.8.6");
 
       const expectedPackageJson = {
         ...GetInitialE2EPackage(testPath),
@@ -104,8 +101,7 @@ describe('Yarn V3 tests', () => {
       CreateE2EStartPackage(testPath, dependenciesJson);
       CreateE2EPackage(testPath);
       SetupYarnRC(testPath);
-//      InstallSDK('corepack',['prepare', '--activate'], testPath);
-//      expect(GetPackageManagerVersion('yarn',testPath)).toBe("3.8.6");
+      expect(GetPackageManagerVersion('yarn',testPath)).toBe("3.8.6");
 
       const expectedPackageJson = {
         ...GetInitialE2EPackage(testPath),
@@ -141,8 +137,7 @@ describe('Yarn V3 tests', () => {
       CreateE2EStartPackage(testPath, dependenciesJson);
       CreateE2EPackage(testPath);
       SetupYarnRC(testPath);
-//      InstallSDK('corepack',['prepare', '--activate'], testPath);
-//      expect(GetPackageManagerVersion('yarn',testPath)).toBe("3.8.6");
+      expect(GetPackageManagerVersion('yarn',testPath)).toBe("3.8.6");
 
       const expectedPackageJson = {
         ...GetInitialE2EPackage(testPath),

diff --git a/test/scripts/check-siblingsHelper.ts b/test/scripts/check-siblingsHelper.ts
@@ -116,6 +116,23 @@ export function InstallSDK(pkgMnger: string, args: ReadonlyArray<string>, rootPa
 }
 
 export function GetPackageManagerVersion(pkgMnger: string, testPath: string): string {
+  const result2 = spawnSync('corepack', ['--version'], {
+    cwd: testPath,
+    stdio: ['pipe'], // Ensure output is in readable string format
+    // Clear env to avoid contamination with root folder.
+    env: {
+      INIT_CWD: testPath
+    }
+  });
+
+  if (result2.error) {
+    throw new Error(`On PATH ${testPath}, Expected corepack to return the version, but got:\nMessage: ${result2.error.message}\nStack: ${result2.error.stack}`);
+  }
+  expect(result2.status).toBe(0);
+  expect(result2.stderr?.toString()).toBeEmpty();
+  expect(result2.stdout.toString().trim()).not.toBeEmpty();
+
+
   const result = spawnSync(pkgMnger, ['--version'], {
     cwd: testPath,
     stdio: ['pipe'], // Ensure output is in readable string format