wrangler 2.1.15 → 2.2.1

package/src/__tests__/pages.test.ts

@@ -60,23 +60,24 @@ describe("pages", () => {
 		await endEventLoop();
 
 		expect(std.out).toMatchInlineSnapshot(`
-		      "wrangler pages
+		"wrangler pages
 
-		      ⚡️ Configure Cloudflare Pages
+		⚡️ Configure Cloudflare Pages
 
-		      Commands:
-		        wrangler pages dev [directory] [-- command..]  🧑‍💻 Develop your full-stack Pages application locally
-		        wrangler pages project                         ⚡️ Interact with your Pages projects
-		        wrangler pages deployment                      🚀 Interact with the deployments of a project
-		        wrangler pages publish [directory]             🆙 Publish a directory of static assets as a Pages deployment
+		Commands:
+		  wrangler pages dev [directory] [-- command..]  🧑‍💻 Develop your full-stack Pages application locally
+		  wrangler pages project                         ⚡️ Interact with your Pages projects
+		  wrangler pages deployment                      🚀 Interact with the deployments of a project
+		  wrangler pages publish [directory]             🆙 Publish a directory of static assets as a Pages deployment
 
-		      Flags:
-		        -c, --config   Path to .toml configuration file  [string]
-		        -h, --help     Show help  [boolean]
-		        -v, --version  Show version number  [boolean]
+		Flags:
+		  -c, --config   Path to .toml configuration file  [string]
+		  -e, --env      Environment to use for operations and .env files  [string]
+		  -h, --help     Show help  [boolean]
+		  -v, --version  Show version number  [boolean]
 
-		      🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
-	    `);
+		🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
+	`);
 	});
 
 	describe("beta message for subcommands", () => {
@@ -315,26 +316,27 @@ describe("pages", () => {
 			await endEventLoop();
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "wrangler pages publish [directory]
+			"wrangler pages publish [directory]
 
-			        🆙 Publish a directory of static assets as a Pages deployment
+			🆙 Publish a directory of static assets as a Pages deployment
 
-			        Positionals:
-			          directory  The directory of static files to upload  [string]
+			Positionals:
+			  directory  The directory of static files to upload  [string]
 
-			        Flags:
-			          -h, --help     Show help  [boolean]
-			          -v, --version  Show version number  [boolean]
+			Flags:
+			  -e, --env      Environment to use for operations and .env files  [string]
+			  -h, --help     Show help  [boolean]
+			  -v, --version  Show version number  [boolean]
 
-			        Options:
-			              --project-name    The name of the project you want to deploy to  [string]
-			              --branch          The name of the branch you want to deploy to  [string]
-			              --commit-hash     The SHA to attach to this deployment  [string]
-			              --commit-message  The commit message to attach to this deployment  [string]
-			              --commit-dirty    Whether or not the workspace should be considered dirty for this deployment  [boolean]
+			Options:
+			      --project-name    The name of the project you want to deploy to  [string]
+			      --branch          The name of the branch you want to deploy to  [string]
+			      --commit-hash     The SHA to attach to this deployment  [string]
+			      --commit-message  The commit message to attach to this deployment  [string]
+			      --commit-dirty    Whether or not the workspace should be considered dirty for this deployment  [boolean]
 
-			        🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
-		      `);
+			🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
+		`);
 		});
 
 		it("should upload a directory of files", async () => {
@@ -399,6 +401,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish . --project-name=foo");
 
 			expect(std.out).toMatchInlineSnapshot(`
@@ -468,6 +481,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish . --project-name=foo");
 
 			// Assert two identical requests
@@ -562,6 +586,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish . --project-name=foo");
 
 			// Assert two requests
@@ -656,6 +691,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish . --project-name=foo");
 
 			// We have 3 buckets, so expect 3 uploads
@@ -770,6 +816,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler(`pages publish public --project-name=foo`);
 
 			// We have 3 buckets, so expect 3 uploads
@@ -884,6 +941,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			chdir("public");
 			await runWrangler(`pages publish . --project-name=foo`);
 
@@ -986,6 +1054,17 @@ describe("pages", () => {
 				})
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish . --project-name=foo");
 
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -1130,6 +1209,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish public --project-name=foo");
 
 			expect(std.out).toMatchInlineSnapshot(`
@@ -1236,6 +1326,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish public --project-name=foo");
 
 			expect(std.out).toMatchInlineSnapshot(`
@@ -1387,6 +1488,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish public --project-name=foo");
 
 			expect(std.out).toMatchInlineSnapshot(`
@@ -1473,6 +1585,17 @@ describe("pages", () => {
 				});
 			});
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await expect(runWrangler("pages publish public --project-name=foo"))
 				.rejects
 				.toThrow(`Invalid _routes.json file found at: public/_routes.json
@@ -1625,6 +1748,17 @@ and that at least one include rule is provided.
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish public --project-name=foo");
 
 			expect(std.out).toMatchInlineSnapshot(`
@@ -1710,6 +1844,17 @@ and that at least one include rule is provided.
 				});
 			});
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await expect(runWrangler("pages publish public --project-name=foo"))
 				.rejects
 				.toThrow(`Invalid _routes.json file found at: public/_routes.json
@@ -1827,6 +1972,17 @@ and that at least one include rule is provided.
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish public --project-name=foo");
 
 			expect(std.out).toMatchInlineSnapshot(`
@@ -1955,29 +2111,37 @@ and that at least one include rule is provided.
 			assertLater(() => {
 				expect(requests.length).toBe(3);
 
-				expect(requests[0].headers).toMatchObject({
+				const sortedRequests = requests.sort((a, b) => {
+					return (JSON.parse(a.body as string)[0].key as string).localeCompare(
+						JSON.parse(b.body as string)[0].key as string
+					);
+				});
+
+				expect(sortedRequests[0].headers).toMatchObject({
 					Authorization: "Bearer <<funfetti-auth-jwt>>",
 				});
 
 				let body = JSON.parse(
-					requests[0].body as string
+					sortedRequests[0].body as string
 				) as UploadPayloadFile[];
 				expect(body).toMatchObject([
 					{
-						key: "95dedb64e6d4940fc2e0f11f711cc2f4",
-						value: Buffer.from("headersfile").toString("base64"),
+						key: "09a79777abda8ccc8bdd51dd3ff8e9e9",
+						value: Buffer.from("func").toString("base64"),
 						metadata: {
-							contentType: "application/octet-stream",
+							contentType: "application/javascript",
 						},
 						base64: true,
 					},
 				]);
 
-				expect(requests[1].headers).toMatchObject({
+				expect(sortedRequests[1].headers).toMatchObject({
 					Authorization: "Bearer <<funfetti-auth-jwt>>",
 				});
 
-				body = JSON.parse(requests[1].body as string) as UploadPayloadFile[];
+				body = JSON.parse(
+					sortedRequests[1].body as string
+				) as UploadPayloadFile[];
 				expect(body).toMatchObject([
 					{
 						key: "2082190357cfd3617ccfe04f340c6247",
@@ -1989,17 +2153,19 @@ and that at least one include rule is provided.
 					},
 				]);
 
-				expect(requests[2].headers).toMatchObject({
+				expect(sortedRequests[2].headers).toMatchObject({
 					Authorization: "Bearer <<funfetti-auth-jwt>>",
 				});
 
-				body = JSON.parse(requests[2].body as string) as UploadPayloadFile[];
+				body = JSON.parse(
+					sortedRequests[2].body as string
+				) as UploadPayloadFile[];
 				expect(body).toMatchObject([
 					{
-						key: "09a79777abda8ccc8bdd51dd3ff8e9e9",
-						value: Buffer.from("func").toString("base64"),
+						key: "95dedb64e6d4940fc2e0f11f711cc2f4",
+						value: Buffer.from("headersfile").toString("base64"),
 						metadata: {
-							contentType: "application/javascript",
+							contentType: "application/octet-stream",
 						},
 						base64: true,
 					},