wrangler 0.0.0-e2a26a0 → 0.0.0-e2b7352

package/src/__tests__/r2.test.ts

@@ -0,0 +1,198 @@
+import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
+import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+import type { R2BucketInfo } from "../r2";
+
+describe("wrangler", () => {
+  mockAccountId();
+  mockApiToken();
+  runInTempDir();
+  const std = mockConsoleMethods();
+
+  afterEach(() => {
+    unsetAllMocks();
+  });
+
+  describe("r2", () => {
+    describe("bucket", () => {
+      describe("list", () => {
+        function mockListRequest(buckets: R2BucketInfo[]) {
+          const requests = { count: 0 };
+          setMockResponse(
+            "/accounts/:accountId/r2/buckets",
+            ([_url, accountId], init) => {
+              requests.count++;
+              expect(accountId).toEqual("some-account-id");
+              expect(init).toEqual({});
+              return { buckets };
+            }
+          );
+          return requests;
+        }
+
+        it("should list buckets", async () => {
+          const expectedBuckets: R2BucketInfo[] = [
+            { name: "bucket-1", creation_date: "01-01-2001" },
+            { name: "bucket-2", creation_date: "01-01-2001" },
+          ];
+          mockListRequest(expectedBuckets);
+          await runWrangler("r2 bucket list");
+
+          expect(std.err).toMatchInlineSnapshot(`""`);
+          const buckets = JSON.parse(std.out);
+          expect(buckets).toEqual(expectedBuckets);
+        });
+      });
+
+      describe("create", () => {
+        function mockCreateRequest(expectedBucketName: string) {
+          const requests = { count: 0 };
+          setMockResponse(
+            "/accounts/:accountId/r2/buckets/:bucketName",
+            "PUT",
+            ([_url, accountId, bucketName]) => {
+              expect(accountId).toEqual("some-account-id");
+              expect(bucketName).toEqual(expectedBucketName);
+              requests.count += 1;
+            }
+          );
+          return requests;
+        }
+
+        it("should error if no bucket name is given", async () => {
+          await expect(
+            runWrangler("r2 bucket create")
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"Not enough non-option arguments: got 0, need at least 1"`
+          );
+          expect(std.out).toMatchInlineSnapshot(`""`);
+          expect(std.err).toMatchInlineSnapshot(`
+            "wrangler r2 bucket create <name>
+
+            Create a new R2 bucket
+
+            Positionals:
+              name  The name of the new bucket  [string] [required]
+
+            Flags:
+              -c, --config      Path to .toml configuration file  [string]
+              -h, --help        Show help  [boolean]
+              -v, --version     Show version number  [boolean]
+                  --legacy-env  Use legacy environments  [boolean]
+
+            Not enough non-option arguments: got 0, need at least 1"
+          `);
+        });
+
+        it("should error if the bucket to create contains spaces", async () => {
+          await expect(
+            runWrangler("r2 bucket create abc def ghi")
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"Unknown arguments: def, ghi"`
+          );
+          expect(std.out).toMatchInlineSnapshot(`""`);
+          expect(std.err).toMatchInlineSnapshot(`
+            "wrangler r2 bucket create <name>
+
+            Create a new R2 bucket
+
+            Positionals:
+              name  The name of the new bucket  [string] [required]
+
+            Flags:
+              -c, --config      Path to .toml configuration file  [string]
+              -h, --help        Show help  [boolean]
+              -v, --version     Show version number  [boolean]
+                  --legacy-env  Use legacy environments  [boolean]
+
+            Unknown arguments: def, ghi"
+          `);
+        });
+
+        it("should create a bucket", async () => {
+          const requests = mockCreateRequest("testBucket");
+          await runWrangler("r2 bucket create testBucket");
+          expect(std.out).toMatchInlineSnapshot(`
+            "Creating bucket testBucket.
+            Created bucket testBucket."
+          `);
+          expect(requests.count).toEqual(1);
+        });
+      });
+
+      describe("delete", () => {
+        function mockDeleteRequest(expectedBucketName: string) {
+          const requests = { count: 0 };
+          setMockResponse(
+            "/accounts/:accountId/r2/buckets/:bucketName",
+            "DELETE",
+            ([_url, accountId, bucketName]) => {
+              expect(accountId).toEqual("some-account-id");
+              expect(bucketName).toEqual(expectedBucketName);
+              requests.count += 1;
+            }
+          );
+          return requests;
+        }
+
+        it("should error if no bucket name is given", async () => {
+          await expect(
+            runWrangler("r2 bucket delete")
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"Not enough non-option arguments: got 0, need at least 1"`
+          );
+          expect(std.out).toMatchInlineSnapshot(`""`);
+          expect(std.err).toMatchInlineSnapshot(`
+            "wrangler r2 bucket delete <name>
+
+            Delete an R2 bucket
+
+            Positionals:
+              name  The name of the bucket to delete  [string] [required]
+
+            Flags:
+              -c, --config      Path to .toml configuration file  [string]
+              -h, --help        Show help  [boolean]
+              -v, --version     Show version number  [boolean]
+                  --legacy-env  Use legacy environments  [boolean]
+
+            Not enough non-option arguments: got 0, need at least 1"
+          `);
+        });
+
+        it("should error if the bucket name to delete contains spaces", async () => {
+          await expect(
+            runWrangler("r2 bucket delete abc def ghi")
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"Unknown arguments: def, ghi"`
+          );
+          expect(std.out).toMatchInlineSnapshot(`""`);
+          expect(std.err).toMatchInlineSnapshot(`
+            "wrangler r2 bucket delete <name>
+
+            Delete an R2 bucket
+
+            Positionals:
+              name  The name of the bucket to delete  [string] [required]
+
+            Flags:
+              -c, --config      Path to .toml configuration file  [string]
+              -h, --help        Show help  [boolean]
+              -v, --version     Show version number  [boolean]
+                  --legacy-env  Use legacy environments  [boolean]
+
+            Unknown arguments: def, ghi"
+          `);
+        });
+
+        it("should delete a bucket specified by name", async () => {
+          const requests = mockDeleteRequest("some-bucket");
+          await runWrangler(`r2 bucket delete some-bucket`);
+          expect(requests.count).toEqual(1);
+        });
+      });
+    });
+  });
+});

package/src/__tests__/route.test.ts

@@ -0,0 +1,45 @@
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+
+describe("wrangler route", () => {
+  mockConsoleMethods();
+  runInTempDir();
+
+  it("shows a deprecation notice when `wrangler route` is run", async () => {
+    await expect(runWrangler("route")).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+            "DEPRECATION WARNING:
+            \`wrangler route\` has been deprecated.
+            Please use wrangler.toml and/or \`wrangler publish --routes\` to modify routes"
+          `);
+  });
+
+  it("shows a deprecation notice when `wrangler route delete` is run", async () => {
+    await expect(runWrangler("route delete")).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+            "DEPRECATION WARNING:
+            \`wrangler route delete\` has been deprecated.
+            Remove the unwanted route(s) from wrangler.toml and run \`wrangler publish\` to remove your worker from those routes."
+          `);
+  });
+
+  it("shows a deprecation notice when `wrangler route delete <id>` is run", async () => {
+    await expect(runWrangler("route delete some-zone-id")).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+            "DEPRECATION WARNING:
+            \`wrangler route delete\` has been deprecated.
+            Remove the unwanted route(s) from wrangler.toml and run \`wrangler publish\` to remove your worker from those routes."
+          `);
+  });
+
+  it("shows a deprecation notice when `wrangler route list` is run", async () => {
+    await expect(runWrangler("route list")).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+            "DEPRECATION WARNING:
+            \`wrangler route list\` has been deprecated.
+            Refer to wrangler.toml for a list of routes the worker will be deployed to upon publishing.
+            Refer to the Cloudflare Dashboard to see the routes this worker is currently running on."
+          `);
+  });
+});