From 39f6c29e4fdd1970bca1694ca2b9dcd3d14da1f7 Mon Sep 17 00:00:00 2001
From: Aaron <aaronklinker1@gmail.com>
Date: Fri, 21 Jun 2024 09:08:33 -0500
Subject: [PATCH] chore: Refactor package manager test fixtures

---
 .../core/package-managers/__tests__/bun.test.ts  |   4 ++--
 .../bun.lockb                                    | Bin
 .../package.json                                 |   0
 .../package-lock.json                            |   0
 .../package.json                                 |   0
 .../package.json                                 |   0
 .../pnpm-lock.yaml                               |   0
 .../package.json                                 |   0
 .../yarn.lock                                    |   0
 .../core/package-managers/__tests__/npm.test.ts  |  15 ++++++++-------
 .../core/package-managers/__tests__/pnpm.test.ts |  13 ++++++-------
 .../core/package-managers/__tests__/yarn.test.ts |   4 ++--
 12 files changed, 18 insertions(+), 18 deletions(-)
 rename packages/wxt/src/core/package-managers/__tests__/fixtures/{bun-project => simple-bun-project}/bun.lockb (100%)
 rename packages/wxt/src/core/package-managers/__tests__/fixtures/{bun-project => simple-bun-project}/package.json (100%)
 rename packages/wxt/src/core/package-managers/__tests__/fixtures/{npm-project => simple-npm-project}/package-lock.json (100%)
 rename packages/wxt/src/core/package-managers/__tests__/fixtures/{npm-project => simple-npm-project}/package.json (100%)
 rename packages/wxt/src/core/package-managers/__tests__/fixtures/{pnpm-project => simple-pnpm-project}/package.json (100%)
 rename packages/wxt/src/core/package-managers/__tests__/fixtures/{pnpm-project => simple-pnpm-project}/pnpm-lock.yaml (100%)
 rename packages/wxt/src/core/package-managers/__tests__/fixtures/{yarn-project => simple-yarn-project}/package.json (100%)
 rename packages/wxt/src/core/package-managers/__tests__/fixtures/{yarn-project => simple-yarn-project}/yarn.lock (100%)

diff --git a/packages/wxt/src/core/package-managers/__tests__/bun.test.ts b/packages/wxt/src/core/package-managers/__tests__/bun.test.ts
index 4baa8cc9..4a351e53 100644
--- a/packages/wxt/src/core/package-managers/__tests__/bun.test.ts
+++ b/packages/wxt/src/core/package-managers/__tests__/bun.test.ts
@@ -2,12 +2,12 @@ import { describe, expect, it } from 'vitest';
 import path from 'node:path';
 import { bun } from '../bun';
 
-const cwd = path.resolve(__dirname, 'fixtures/bun-project');
-
 describe.skipIf(() => process.platform === 'win32')(
   'Bun Package Management Utils',
   () => {
     describe('listDependencies', () => {
+      const cwd = path.resolve(__dirname, 'fixtures/simple-bun-project');
+
       it('should list direct dependencies', async () => {
         const actual = await bun.listDependencies({ cwd });
         expect(actual).toEqual([
diff --git a/packages/wxt/src/core/package-managers/__tests__/fixtures/bun-project/bun.lockb b/packages/wxt/src/core/package-managers/__tests__/fixtures/simple-bun-project/bun.lockb
similarity index 100%
rename from packages/wxt/src/core/package-managers/__tests__/fixtures/bun-project/bun.lockb
rename to packages/wxt/src/core/package-managers/__tests__/fixtures/simple-bun-project/bun.lockb
diff --git a/packages/wxt/src/core/package-managers/__tests__/fixtures/bun-project/package.json b/packages/wxt/src/core/package-managers/__tests__/fixtures/simple-bun-project/package.json
similarity index 100%
rename from packages/wxt/src/core/package-managers/__tests__/fixtures/bun-project/package.json
rename to packages/wxt/src/core/package-managers/__tests__/fixtures/simple-bun-project/package.json
diff --git a/packages/wxt/src/core/package-managers/__tests__/fixtures/npm-project/package-lock.json b/packages/wxt/src/core/package-managers/__tests__/fixtures/simple-npm-project/package-lock.json
similarity index 100%
rename from packages/wxt/src/core/package-managers/__tests__/fixtures/npm-project/package-lock.json
rename to packages/wxt/src/core/package-managers/__tests__/fixtures/simple-npm-project/package-lock.json
diff --git a/packages/wxt/src/core/package-managers/__tests__/fixtures/npm-project/package.json b/packages/wxt/src/core/package-managers/__tests__/fixtures/simple-npm-project/package.json
similarity index 100%
rename from packages/wxt/src/core/package-managers/__tests__/fixtures/npm-project/package.json
rename to packages/wxt/src/core/package-managers/__tests__/fixtures/simple-npm-project/package.json
diff --git a/packages/wxt/src/core/package-managers/__tests__/fixtures/pnpm-project/package.json b/packages/wxt/src/core/package-managers/__tests__/fixtures/simple-pnpm-project/package.json
similarity index 100%
rename from packages/wxt/src/core/package-managers/__tests__/fixtures/pnpm-project/package.json
rename to packages/wxt/src/core/package-managers/__tests__/fixtures/simple-pnpm-project/package.json
diff --git a/packages/wxt/src/core/package-managers/__tests__/fixtures/pnpm-project/pnpm-lock.yaml b/packages/wxt/src/core/package-managers/__tests__/fixtures/simple-pnpm-project/pnpm-lock.yaml
similarity index 100%
rename from packages/wxt/src/core/package-managers/__tests__/fixtures/pnpm-project/pnpm-lock.yaml
rename to packages/wxt/src/core/package-managers/__tests__/fixtures/simple-pnpm-project/pnpm-lock.yaml
diff --git a/packages/wxt/src/core/package-managers/__tests__/fixtures/yarn-project/package.json b/packages/wxt/src/core/package-managers/__tests__/fixtures/simple-yarn-project/package.json
similarity index 100%
rename from packages/wxt/src/core/package-managers/__tests__/fixtures/yarn-project/package.json
rename to packages/wxt/src/core/package-managers/__tests__/fixtures/simple-yarn-project/package.json
diff --git a/packages/wxt/src/core/package-managers/__tests__/fixtures/yarn-project/yarn.lock b/packages/wxt/src/core/package-managers/__tests__/fixtures/simple-yarn-project/yarn.lock
similarity index 100%
rename from packages/wxt/src/core/package-managers/__tests__/fixtures/yarn-project/yarn.lock
rename to packages/wxt/src/core/package-managers/__tests__/fixtures/simple-yarn-project/yarn.lock
diff --git a/packages/wxt/src/core/package-managers/__tests__/npm.test.ts b/packages/wxt/src/core/package-managers/__tests__/npm.test.ts
index 668de8e4..5e27e3e1 100644
--- a/packages/wxt/src/core/package-managers/__tests__/npm.test.ts
+++ b/packages/wxt/src/core/package-managers/__tests__/npm.test.ts
@@ -4,15 +4,14 @@ import { npm } from '../npm';
 import { execaCommand } from 'execa';
 import { exists } from 'fs-extra';
 
-const cwd = path.resolve(__dirname, 'fixtures/npm-project');
-
 describe('NPM Package Management Utils', () => {
-  beforeAll(async () => {
-    // NPM needs the modules installed for 'npm ls' to work
-    await execaCommand('npm i', { cwd });
-  }, 60e3);
-
   describe('listDependencies', () => {
+    const cwd = path.resolve(__dirname, 'fixtures/simple-npm-project');
+    beforeAll(async () => {
+      // NPM needs the modules installed for 'npm ls' to work
+      await execaCommand('npm i', { cwd });
+    }, 60e3);
+
     it('should list direct dependencies', async () => {
       const actual = await npm.listDependencies({ cwd });
       expect(actual).toEqual([
@@ -32,6 +31,8 @@ describe('NPM Package Management Utils', () => {
   });
 
   describe('downloadDependency', () => {
+    const cwd = path.resolve(__dirname, 'fixtures/simple-npm-project');
+
     it('should download the dependency as a tarball', async () => {
       const downloadDir = path.resolve(cwd, 'dist');
       const id = 'mime-db@1.52.0';
diff --git a/packages/wxt/src/core/package-managers/__tests__/pnpm.test.ts b/packages/wxt/src/core/package-managers/__tests__/pnpm.test.ts
index 84edcb4c..34b48811 100644
--- a/packages/wxt/src/core/package-managers/__tests__/pnpm.test.ts
+++ b/packages/wxt/src/core/package-managers/__tests__/pnpm.test.ts
@@ -3,17 +3,16 @@ import path from 'node:path';
 import { pnpm } from '../pnpm';
 import { execaCommand } from 'execa';
 
-const cwd = path.resolve(__dirname, 'fixtures/pnpm-project');
-
 process.env.WXT_PNPM_IGNORE_WORKSPACE = 'true';
 
 describe('PNPM Package Management Utils', () => {
-  beforeAll(async () => {
-    // PNPM needs the modules installed, or 'pnpm ls' will return a blank list.
-    await execaCommand('pnpm i --ignore-workspace', { cwd });
-  });
-
   describe('listDependencies', () => {
+    const cwd = path.resolve(__dirname, 'fixtures/simple-pnpm-project');
+    beforeAll(async () => {
+      // PNPM needs the modules installed, or 'pnpm ls' will return a blank list.
+      await execaCommand('pnpm i --ignore-workspace', { cwd });
+    });
+
     it('should list direct dependencies', async () => {
       const actual = await pnpm.listDependencies({ cwd });
       expect(actual).toEqual([
diff --git a/packages/wxt/src/core/package-managers/__tests__/yarn.test.ts b/packages/wxt/src/core/package-managers/__tests__/yarn.test.ts
index 7195e04d..40415b7d 100644
--- a/packages/wxt/src/core/package-managers/__tests__/yarn.test.ts
+++ b/packages/wxt/src/core/package-managers/__tests__/yarn.test.ts
@@ -2,10 +2,10 @@ import { describe, expect, it } from 'vitest';
 import path from 'node:path';
 import { yarn } from '../yarn';
 
-const cwd = path.resolve(__dirname, 'fixtures/yarn-project');
-
 describe('Yarn Package Management Utils', () => {
   describe('listDependencies', () => {
+    const cwd = path.resolve(__dirname, 'fixtures/simple-yarn-project');
+
     it('should list direct dependencies', async () => {
       const actual = await yarn.listDependencies({ cwd });
       expect(actual).toEqual([