wrangler 0.0.0-e452a04 → 0.0.0-e464fcdb

package/src/__tests__/package-manager.test.ts

@@ -4,203 +4,350 @@ import { mockConsoleMethods } from "./helpers/mock-console";
 import { runInTempDir } from "./helpers/run-in-tmp";
 
 const { getPackageManager, getPackageManagerName } =
-  jest.requireActual("../package-manager");
+	jest.requireActual("../package-manager");
 interface TestCase {
-  npm: boolean;
-  yarn: boolean;
-  npmLockFile: boolean;
-  yarnLockFile: boolean;
-  expectedPackageManager: string;
+	npm: boolean;
+	pnpm: boolean;
+	yarn: boolean;
+	npmLockFile: boolean;
+	yarnLockFile: boolean;
+	pnpmLockFile: boolean;
+	expectedPackageManager: string;
 }
 
 const testCases: TestCase[] = [
-  // npm binary - no yarn binary
-  {
-    npm: true,
-    yarn: false,
-    npmLockFile: false,
-    yarnLockFile: false,
-    expectedPackageManager: "npm",
-  },
-  {
-    npm: true,
-    yarn: false,
-    npmLockFile: true,
-    yarnLockFile: false,
-    expectedPackageManager: "npm",
-  },
-  {
-    npm: true,
-    yarn: false,
-    npmLockFile: false,
-    yarnLockFile: true,
-    expectedPackageManager: "npm",
-  },
-  {
-    npm: true,
-    yarn: false,
-    npmLockFile: true,
-    yarnLockFile: true,
-    expectedPackageManager: "npm",
-  },
+	// npm binary only
+	{
+		npm: true,
+		yarn: false,
+		pnpm: false,
+		npmLockFile: false,
+		yarnLockFile: false,
+		pnpmLockFile: false,
+		expectedPackageManager: "npm",
+	},
+	{
+		npm: true,
+		yarn: false,
+		pnpm: false,
+		npmLockFile: true,
+		yarnLockFile: false,
+		pnpmLockFile: false,
+		expectedPackageManager: "npm",
+	},
+	{
+		npm: true,
+		yarn: false,
+		pnpm: false,
+		npmLockFile: false,
+		yarnLockFile: true,
+		pnpmLockFile: false,
+		expectedPackageManager: "npm",
+	},
+	{
+		npm: true,
+		yarn: false,
+		pnpm: false,
+		npmLockFile: true,
+		yarnLockFile: true,
+		pnpmLockFile: false,
+		expectedPackageManager: "npm",
+	},
 
-  // yarn binary - no npm binary
-  {
-    npm: false,
-    yarn: true,
-    npmLockFile: false,
-    yarnLockFile: false,
-    expectedPackageManager: "yarn",
-  },
-  {
-    npm: false,
-    yarn: true,
-    npmLockFile: true,
-    yarnLockFile: false,
-    expectedPackageManager: "yarn",
-  },
-  {
-    npm: false,
-    yarn: true,
-    npmLockFile: false,
-    yarnLockFile: true,
-    expectedPackageManager: "yarn",
-  },
-  {
-    npm: false,
-    yarn: true,
-    npmLockFile: true,
-    yarnLockFile: true,
-    expectedPackageManager: "yarn",
-  },
+	// yarn binary only
+	{
+		npm: false,
+		yarn: true,
+		pnpm: false,
+		npmLockFile: false,
+		yarnLockFile: false,
+		pnpmLockFile: false,
+		expectedPackageManager: "yarn",
+	},
+	{
+		npm: false,
+		yarn: true,
+		pnpm: false,
+		npmLockFile: true,
+		yarnLockFile: false,
+		pnpmLockFile: false,
+		expectedPackageManager: "yarn",
+	},
+	{
+		npm: false,
+		yarn: true,
+		pnpm: false,
+		npmLockFile: false,
+		yarnLockFile: true,
+		pnpmLockFile: false,
+		expectedPackageManager: "yarn",
+	},
+	{
+		npm: false,
+		yarn: true,
+		pnpm: false,
+		npmLockFile: true,
+		yarnLockFile: true,
+		pnpmLockFile: false,
+		expectedPackageManager: "yarn",
+	},
 
-  // npm and yarn binaries
-  {
-    npm: true,
-    yarn: true,
-    npmLockFile: false,
-    yarnLockFile: false,
-    expectedPackageManager: "npm",
-  },
-  {
-    npm: true,
-    yarn: true,
-    npmLockFile: true,
-    yarnLockFile: false,
-    expectedPackageManager: "npm",
-  },
-  {
-    npm: true,
-    yarn: true,
-    npmLockFile: false,
-    yarnLockFile: true,
-    expectedPackageManager: "yarn",
-  },
-  {
-    npm: true,
-    yarn: true,
-    npmLockFile: true,
-    yarnLockFile: true,
-    expectedPackageManager: "npm",
-  },
+	// pnpm binary only
+	{
+		npm: false,
+		yarn: false,
+		pnpm: true,
+		npmLockFile: false,
+		yarnLockFile: false,
+		pnpmLockFile: true,
+		expectedPackageManager: "pnpm",
+	},
+	{
+		npm: false,
+		yarn: false,
+		pnpm: true,
+		npmLockFile: true,
+		yarnLockFile: false,
+		pnpmLockFile: false,
+		expectedPackageManager: "pnpm",
+	},
+	{
+		npm: false,
+		yarn: false,
+		pnpm: true,
+		npmLockFile: false,
+		yarnLockFile: true,
+		pnpmLockFile: false,
+		expectedPackageManager: "pnpm",
+	},
+	{
+		npm: false,
+		yarn: false,
+		pnpm: true,
+		npmLockFile: true,
+		yarnLockFile: true,
+		pnpmLockFile: true,
+		expectedPackageManager: "pnpm",
+	},
+
+	// npm and yarn binaries
+	{
+		npm: true,
+		yarn: true,
+		pnpm: false,
+		npmLockFile: false,
+		yarnLockFile: false,
+		pnpmLockFile: false,
+		expectedPackageManager: "npm",
+	},
+	{
+		npm: true,
+		yarn: true,
+		pnpm: false,
+		npmLockFile: true,
+		yarnLockFile: false,
+		pnpmLockFile: false,
+		expectedPackageManager: "npm",
+	},
+	{
+		npm: true,
+		yarn: true,
+		pnpm: false,
+		npmLockFile: false,
+		yarnLockFile: true,
+		pnpmLockFile: false,
+		expectedPackageManager: "yarn",
+	},
+	{
+		npm: true,
+		yarn: true,
+		pnpm: false,
+		npmLockFile: true,
+		yarnLockFile: true,
+		pnpmLockFile: false,
+		expectedPackageManager: "npm",
+	},
+	// npm, yarn and pnpm binaries
+	{
+		npm: true,
+		yarn: true,
+		pnpm: true,
+		npmLockFile: false,
+		yarnLockFile: false,
+		pnpmLockFile: false,
+		expectedPackageManager: "npm",
+	},
+	{
+		npm: true,
+		yarn: true,
+		pnpm: true,
+		npmLockFile: true,
+		yarnLockFile: false,
+		pnpmLockFile: false,
+		expectedPackageManager: "npm",
+	},
+	{
+		npm: true,
+		yarn: true,
+		pnpm: true,
+		npmLockFile: false,
+		yarnLockFile: true,
+		pnpmLockFile: false,
+		expectedPackageManager: "yarn",
+	},
+	{
+		npm: true,
+		yarn: true,
+		pnpm: true,
+		npmLockFile: false,
+		yarnLockFile: false,
+		pnpmLockFile: true,
+		expectedPackageManager: "pnpm",
+	},
+	{
+		npm: true,
+		yarn: true,
+		pnpm: true,
+		npmLockFile: true,
+		yarnLockFile: true,
+		pnpmLockFile: true,
+		expectedPackageManager: "npm",
+	},
 ];
 
 describe("getPackageManager()", () => {
-  runInTempDir();
-  mockConsoleMethods();
+	runInTempDir();
+	mockConsoleMethods();
 
-  describe("no supported package manager", () => {
-    mockYarn(false);
-    mockNpm(false);
+	describe("no supported package manager", () => {
+		mockYarn(false);
+		mockNpm(false);
+		mockPnpm(false);
 
-    it("should throw an error", async () => {
-      await expect(() =>
-        getPackageManager(process.cwd())
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Unable to find a package manager. Supported managers are: npm and yarn."`
-      );
-    });
-  });
+		it("should throw an error", async () => {
+			await expect(() =>
+				getPackageManager(process.cwd())
+			).rejects.toThrowErrorMatchingInlineSnapshot(
+				`"Unable to find a package manager. Supported managers are: npm, yarn, and pnpm."`
+			);
+		});
+	});
 
-  for (const {
-    npm,
-    yarn,
-    npmLockFile,
-    yarnLockFile,
-    expectedPackageManager,
-  } of testCases) {
-    describe(
-      getTestCaseDescription(npm, yarn, npmLockFile, yarnLockFile),
-      () => {
-        mockYarn(yarn);
-        mockNpm(npm);
-        mockLockFiles(npmLockFile, yarnLockFile);
+	for (const {
+		npm,
+		yarn,
+		pnpm,
+		npmLockFile,
+		yarnLockFile,
+		pnpmLockFile,
+		expectedPackageManager,
+	} of testCases) {
+		describe(
+			getTestCaseDescription(
+				npm,
+				yarn,
+				pnpm,
+				npmLockFile,
+				yarnLockFile,
+				pnpmLockFile
+			),
+			() => {
+				mockYarn(yarn);
+				mockNpm(npm);
+				mockPnpm(pnpm);
+				mockLockFiles(npmLockFile, yarnLockFile, pnpmLockFile);
 
-        it(`should return the ${expectedPackageManager} package manager`, async () => {
-          const actualPackageManager = await getPackageManager(process.cwd());
-          expect(getPackageManagerName(actualPackageManager)).toEqual(
-            expectedPackageManager
-          );
-        });
-      }
-    );
-  }
+				it(`should return the ${expectedPackageManager} package manager`, async () => {
+					const actualPackageManager = await getPackageManager(process.cwd());
+					expect(getPackageManagerName(actualPackageManager)).toEqual(
+						expectedPackageManager
+					);
+				});
+			}
+		);
+	}
 });
 
 /**
  * Create a fake yarn binary
  */
 function mockYarn(succeed: boolean): void {
-  let unMock: () => void;
-  beforeEach(async () => {
-    unMock = await mockBinary("yarn", `process.exit(${succeed ? 0 : 1})`);
-  });
-  afterEach(() => unMock());
+	let unMock: () => void;
+	beforeEach(async () => {
+		unMock = await mockBinary("yarn", `process.exit(${succeed ? 0 : 1})`);
+	});
+	afterEach(() => unMock());
 }
 
 /**
  * Create a fake npm binary
  */
 function mockNpm(succeed: boolean): void {
-  let unMock: () => void;
-  beforeEach(async () => {
-    unMock = await mockBinary("npm", `process.exit(${succeed ? 0 : 1})`);
-  });
-  afterEach(() => unMock());
+	let unMock: () => void;
+	beforeEach(async () => {
+		unMock = await mockBinary("npm", `process.exit(${succeed ? 0 : 1})`);
+	});
+	afterEach(() => unMock());
+}
+
+/**
+ * Create a fake pnpm binary
+ */
+function mockPnpm(succeed: boolean): void {
+	let unMock: () => void;
+	beforeEach(async () => {
+		unMock = await mockBinary("pnpm", `process.exit(${succeed ? 0 : 1})`);
+	});
+	afterEach(() => unMock());
 }
 
 /**
  * Create a fake lock files.
  */
-function mockLockFiles(npmLockFile: boolean, yarnLockFile: boolean) {
-  beforeEach(() => {
-    if (npmLockFile) {
-      writeFileSync("package-lock.json", "");
-    }
-    if (yarnLockFile) {
-      writeFileSync("yarn.lock", "");
-    }
-  });
+function mockLockFiles(
+	npmLockFile: boolean,
+	yarnLockFile: boolean,
+	pnpmLockFile: boolean
+) {
+	beforeEach(() => {
+		if (npmLockFile) {
+			writeFileSync("package-lock.json", "");
+		}
+		if (yarnLockFile) {
+			writeFileSync("yarn.lock", "");
+		}
+		if (pnpmLockFile) {
+			writeFileSync("pnpm-lock.yaml", "");
+		}
+	});
 }
 
 function getTestCaseDescription(
-  npm: boolean,
-  yarn: boolean,
-  npmLockFile: boolean,
-  yarnLockFile: boolean
+	npm: boolean,
+	yarn: boolean,
+	pnpm: boolean,
+	npmLockFile: boolean,
+	yarnLockFile: boolean,
+	pnpmLockFile: boolean
 ): string {
-  const criteria: string[] = [];
-  if (npm) {
-    criteria.push("npm");
-  }
-  if (npmLockFile) {
-    criteria.push("package-lock.json");
-  }
-  if (yarn) {
-    criteria.push("yarn");
-  }
-  if (yarnLockFile) {
-    criteria.push("yarn.lock");
-  }
-  return "using " + criteria.join("; ");
+	const criteria: string[] = [];
+	if (npm) {
+		criteria.push("npm");
+	}
+	if (npmLockFile) {
+		criteria.push("package-lock.json");
+	}
+	if (yarn) {
+		criteria.push("yarn");
+	}
+	if (yarnLockFile) {
+		criteria.push("yarn.lock");
+	}
+	if (pnpm) {
+		criteria.push("pnpm");
+	}
+	if (pnpmLockFile) {
+		criteria.push("pnpm-lock.yaml");
+	}
+	return "using " + criteria.join("; ");
 }

package/src/__tests__/pages/deployment-list.test.ts

@@ -0,0 +1,80 @@
+import { rest } from "msw";
+import { endEventLoop } from "../helpers/end-event-loop";
+import { mockConsoleMethods } from "../helpers/mock-console";
+import { mockAccountId, mockApiToken } from "./../helpers/mock-account-id";
+import { msw } from "./../helpers/msw";
+import { runInTempDir } from "./../helpers/run-in-tmp";
+import { runWrangler } from "./../helpers/run-wrangler";
+import type { Deployment } from "./../../pages/types";
+
+describe("deployment list", () => {
+	runInTempDir();
+	mockAccountId();
+	mockApiToken();
+	mockConsoleMethods();
+
+	afterEach(async () => {
+		// Force a tick to ensure that all promises resolve
+		await endEventLoop();
+		// Reset MSW after tick to ensure that all requests have been handled
+		msw.resetHandlers();
+		msw.restoreHandlers();
+	});
+
+	it("should make request to list deployments", async () => {
+		const deployments: Deployment[] = [
+			{
+				id: "87bbc8fe-16be-45cd-81e0-63d722e82cdf",
+				url: "https://87bbc8fe.images.pages.dev",
+				environment: "preview",
+				created_on: "2021-11-17T14:52:26.133835Z",
+				latest_stage: {
+					ended_on: "2021-11-17T14:52:26.133835Z",
+					status: "success",
+				},
+				deployment_trigger: {
+					metadata: {
+						branch: "main",
+						commit_hash: "c7649364c4cb32ad4f65b530b9424e8be5bec9d6",
+					},
+				},
+				project_name: "images",
+			},
+		];
+
+		const requests = mockDeploymentListRequest(deployments);
+		await runWrangler("pages deployment list --project-name=images");
+
+		expect(requests.count).toBe(1);
+	});
+});
+
+/* -------------------------------------------------- */
+/*                    Helper Functions                */
+/* -------------------------------------------------- */
+
+function mockDeploymentListRequest(deployments: unknown[]) {
+	const requests = { count: 0 };
+	msw.use(
+		rest.get(
+			"*/accounts/:accountId/pages/projects/:project/deployments",
+			(req, res, ctx) => {
+				requests.count++;
+
+				expect(req.params.project).toEqual("images");
+				expect(req.params.accountId).toEqual("some-account-id");
+
+				return res.once(
+					ctx.status(200),
+					ctx.json({
+						success: true,
+						errors: [],
+						messages: [],
+						result: deployments,
+					})
+				);
+			}
+		)
+	);
+	return requests;
+}