Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix tests
Browse files Browse the repository at this point in the history
@penalosa
penalosa committed Nov 29, 2024
1 parent f4173f0 commit 0d319cc
Showing 4 changed files with 254 additions and 176 deletions.
52 changes: 25 additions & 27 deletions packages/wrangler/src/__tests__/kv.local.test.ts
View file
Original file line number Diff line number Diff line change
@@ -13,20 +13,20 @@ describe("wrangler", () => {
describe("local", () => {
it("should put local kv storage", async () => {
await runWrangler(
`kv:key get val --namespace-id some-namespace-id --local --text`
`kv:key get val --namespace-id some-namespace-id --text`
);
expect(std.out).toMatchInlineSnapshot(`"Value not found"`);

await runWrangler(
`kv:key put val value --namespace-id some-namespace-id --local`
`kv:key put val value --namespace-id some-namespace-id `
);
expect(std.out).toMatchInlineSnapshot(`
"Value not found
Writing the value \\"value\\" to key \\"val\\" on namespace some-namespace-id."
`);

await runWrangler(
`kv:key get val --namespace-id some-namespace-id --local --text`
`kv:key get val --namespace-id some-namespace-id --text`
);
expect(std.out).toMatchInlineSnapshot(`
"Value not found
@@ -36,7 +36,7 @@ describe("wrangler", () => {
});

it("should list local kv storage", async () => {
await runWrangler(`kv:key list --namespace-id some-namespace-id --local`);
await runWrangler(`kv:key list --namespace-id some-namespace-id `);
expect(std.out).toMatchInlineSnapshot(`"[]"`);
const keyValues = [
{
@@ -58,10 +58,10 @@ describe("wrangler", () => {
];
writeFileSync("./keys.json", JSON.stringify(keyValues));
await runWrangler(
`kv:bulk put keys.json --namespace-id some-namespace-id --local`
`kv:bulk put keys.json --namespace-id some-namespace-id `
);

await runWrangler(`kv:key list --namespace-id some-namespace-id --local`);
await runWrangler(`kv:key list --namespace-id some-namespace-id `);
expect(std.out).toMatchInlineSnapshot(`
"[]
Success!
@@ -82,13 +82,13 @@ describe("wrangler", () => {
`);

await runWrangler(
`kv:key list --namespace-id some-namespace-id --local --prefix a`
`kv:key list --namespace-id some-namespace-id --prefix a`
);
await runWrangler(
`kv:key list --namespace-id some-namespace-id --local --prefix a/b`
`kv:key list --namespace-id some-namespace-id --prefix a/b`
);
await runWrangler(
`kv:key list --namespace-id some-namespace-id --local --prefix abc`
`kv:key list --namespace-id some-namespace-id --prefix abc`
);

expect(std.out).toMatchInlineSnapshot(`
@@ -130,26 +130,24 @@ describe("wrangler", () => {

it("should delete local kv storage", async () => {
await runWrangler(
`kv:key put val value --namespace-id some-namespace-id --local`
`kv:key put val value --namespace-id some-namespace-id `
);
await runWrangler(
`kv:key get val --namespace-id some-namespace-id --local --text`
`kv:key get val --namespace-id some-namespace-id --text`
);
expect(std.out).toMatchInlineSnapshot(`
"Writing the value \\"value\\" to key \\"val\\" on namespace some-namespace-id.
value"
`);
await runWrangler(
`kv:key delete val --namespace-id some-namespace-id --local`
);
await runWrangler(`kv:key delete val --namespace-id some-namespace-id `);
expect(std.out).toMatchInlineSnapshot(`
"Writing the value \\"value\\" to key \\"val\\" on namespace some-namespace-id.
value
Deleting the key \\"val\\" on namespace some-namespace-id."
`);

await runWrangler(
`kv:key get val --namespace-id some-namespace-id --local --text`
`kv:key get val --namespace-id some-namespace-id --text`
);
expect(std.out).toMatchInlineSnapshot(`
"Writing the value \\"value\\" to key \\"val\\" on namespace some-namespace-id.
@@ -160,7 +158,7 @@ describe("wrangler", () => {
});

it("should put local bulk kv storage", async () => {
await runWrangler(`kv:key list --namespace-id bulk-namespace-id --local`);
await runWrangler(`kv:key list --namespace-id bulk-namespace-id `);
expect(std.out).toMatchInlineSnapshot(`"[]"`);

const keyValues = [
@@ -175,23 +173,23 @@ describe("wrangler", () => {
];
writeFileSync("./keys.json", JSON.stringify(keyValues));
await runWrangler(
`kv:bulk put keys.json --namespace-id bulk-namespace-id --local`
`kv:bulk put keys.json --namespace-id bulk-namespace-id `
);
expect(std.out).toMatchInlineSnapshot(`
"[]
Success!"
`);

await runWrangler(
`kv:key get test --namespace-id bulk-namespace-id --local --text`
`kv:key get test --namespace-id bulk-namespace-id --text`
);
expect(std.out).toMatchInlineSnapshot(`
"[]
Success!
value"
`);

await runWrangler(`kv:key list --namespace-id bulk-namespace-id --local`);
await runWrangler(`kv:key list --namespace-id bulk-namespace-id `);
expect(std.out).toMatchInlineSnapshot(`
"[]
Success!
@@ -220,9 +218,9 @@ describe("wrangler", () => {
];
writeFileSync("./keys.json", JSON.stringify(keyValues));
await runWrangler(
`kv:bulk put keys.json --namespace-id bulk-namespace-id --local`
`kv:bulk put keys.json --namespace-id bulk-namespace-id `
);
await runWrangler(`kv:key list --namespace-id bulk-namespace-id --local`);
await runWrangler(`kv:key list --namespace-id bulk-namespace-id `);
expect(std.out).toMatchInlineSnapshot(`
"Success!
[
@@ -237,7 +235,7 @@ describe("wrangler", () => {
const keys = ["hello", "test"];
writeFileSync("./keys.json", JSON.stringify(keys));
await runWrangler(
`kv:bulk delete keys.json --namespace-id bulk-namespace-id --local --force`
`kv:bulk delete keys.json --namespace-id bulk-namespace-id --force`
);
expect(std.out).toMatchInlineSnapshot(`
"Success!
@@ -252,7 +250,7 @@ describe("wrangler", () => {
Success!"
`);

await runWrangler(`kv:key list --namespace-id bulk-namespace-id --local`);
await runWrangler(`kv:key list --namespace-id bulk-namespace-id `);
expect(std.out).toMatchInlineSnapshot(`
"Success!
[
@@ -270,19 +268,19 @@ describe("wrangler", () => {

it("should follow persist-to for local kv storage", async () => {
await runWrangler(
`kv:key put val value --namespace-id some-namespace-id --local`
`kv:key put val value --namespace-id some-namespace-id `
);

await runWrangler(
`kv:key put val persistValue --namespace-id some-namespace-id --local --persist-to ./persistdir`
`kv:key put val persistValue --namespace-id some-namespace-id --persist-to ./persistdir`
);
expect(std.out).toMatchInlineSnapshot(`
"Writing the value \\"value\\" to key \\"val\\" on namespace some-namespace-id.
Writing the value \\"persistValue\\" to key \\"val\\" on namespace some-namespace-id."
`);

await runWrangler(
`kv:key get val --namespace-id some-namespace-id --local --text`
`kv:key get val --namespace-id some-namespace-id --text`
);
expect(std.out).toMatchInlineSnapshot(`
"Writing the value \\"value\\" to key \\"val\\" on namespace some-namespace-id.
@@ -291,7 +289,7 @@ describe("wrangler", () => {
`);

await runWrangler(
`kv:key get val --namespace-id some-namespace-id --local --text --persist-to ./persistdir`
`kv:key get val --namespace-id some-namespace-id --text --persist-to ./persistdir`
);
expect(std.out).toMatchInlineSnapshot(`
"Writing the value \\"value\\" to key \\"val\\" on namespace some-namespace-id.
340 changes: 210 additions & 130 deletions packages/wrangler/src/__tests__/kv.test.ts
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions packages/wrangler/src/__tests__/r2.local.test.ts
View file
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@ describe("r2", () => {
it("should put R2 object from local bucket", async () => {
await expect(() =>
runWrangler(
`r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png --local`
`r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png `
)
).rejects.toThrowErrorMatchingInlineSnapshot(
`[Error: The specified key does not exist.]`
);

fs.writeFileSync("wormhole-img.png", "passageway");
await runWrangler(
`r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png --local`
`r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png `
);
expect(std.out).toMatchInlineSnapshot(`
"Downloading \\"wormhole-img.png\\" from \\"bucketName-object-test\\".
@@ -35,7 +35,7 @@ describe("r2", () => {
`);

await runWrangler(
`r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png --local`
`r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png `
);
expect(std.out).toMatchInlineSnapshot(`
"Downloading \\"wormhole-img.png\\" from \\"bucketName-object-test\\".
@@ -50,11 +50,11 @@ describe("r2", () => {
it("should delete R2 object from local bucket", async () => {
fs.writeFileSync("wormhole-img.png", "passageway");
await runWrangler(
`r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png --local`
`r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png `
);

await runWrangler(
`r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png --local`
`r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png `
);
expect(std.out).toMatchInlineSnapshot(`
"Creating object \\"wormhole-img.png\\" in bucket \\"bucketName-object-test\\".
@@ -64,7 +64,7 @@ describe("r2", () => {
`);

await runWrangler(
`r2 object delete bucketName-object-test/wormhole-img.png --local`
`r2 object delete bucketName-object-test/wormhole-img.png `
);
expect(std.out).toMatchInlineSnapshot(`
"Creating object \\"wormhole-img.png\\" in bucket \\"bucketName-object-test\\".
@@ -77,7 +77,7 @@ describe("r2", () => {

await expect(() =>
runWrangler(
`r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png --local`
`r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png `
)
).rejects.toThrowErrorMatchingInlineSnapshot(
`[Error: The specified key does not exist.]`
@@ -87,23 +87,23 @@ describe("r2", () => {
it("should follow persist-to for object bucket", async () => {
fs.writeFileSync("wormhole-img.png", "passageway");
await runWrangler(
`r2 object put bucketName-object-test/file-one --file ./wormhole-img.png --local`
`r2 object put bucketName-object-test/file-one --file ./wormhole-img.png `
);

await runWrangler(
`r2 object put bucketName-object-test/file-two --file ./wormhole-img.png --local --persist-to ./different-dir`
`r2 object put bucketName-object-test/file-two --file ./wormhole-img.png --persist-to ./different-dir`
);

await expect(() =>
runWrangler(
`r2 object get bucketName-object-test/file-one --file ./wormhole-img.png --local --persist-to ./different-dir`
`r2 object get bucketName-object-test/file-one --file ./wormhole-img.png --persist-to ./different-dir`
)
).rejects.toThrowErrorMatchingInlineSnapshot(
`[Error: The specified key does not exist.]`
);

await runWrangler(
`r2 object get bucketName-object-test/file-two --file ./wormhole-img.png --local --persist-to ./different-dir`
`r2 object get bucketName-object-test/file-two --file ./wormhole-img.png --persist-to ./different-dir`
);
expect(std.out).toMatchInlineSnapshot(`
"Creating object \\"file-one\\" in bucket \\"bucketName-object-test\\".
16 changes: 8 additions & 8 deletions packages/wrangler/src/__tests__/r2.test.ts
View file
Original file line number Diff line number Diff line change
@@ -2085,7 +2085,7 @@ describe("r2", () => {

it("should download R2 object from bucket", async () => {
await runWrangler(
`r2 object get bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
`r2 object get --remote bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
);

expect(std.out).toMatchInlineSnapshot(`
@@ -2096,7 +2096,7 @@ describe("r2", () => {

it("should download R2 object from bucket into directory", async () => {
await runWrangler(
`r2 object get bucketName-object-test/wormhole-img.png --file ./a/b/c/wormhole-img.png`
`r2 object get --remote bucketName-object-test/wormhole-img.png --file ./a/b/c/wormhole-img.png`
);
expect(fs.readFileSync("a/b/c/wormhole-img.png", "utf8")).toBe(
"wormhole-img.png"
@@ -2106,7 +2106,7 @@ describe("r2", () => {
it("should upload R2 object to bucket", async () => {
fs.writeFileSync("wormhole-img.png", "passageway");
await runWrangler(
`r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
`r2 object put --remote bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
);

expect(std.out).toMatchInlineSnapshot(`
@@ -2118,7 +2118,7 @@ describe("r2", () => {
it("should upload R2 object with storage class to bucket", async () => {
fs.writeFileSync("wormhole-img.png", "passageway");
await runWrangler(
`r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png -s InfrequentAccess`
`r2 object put --remote bucketName-object-test/wormhole-img.png --file ./wormhole-img.png -s InfrequentAccess`
);

expect(std.out).toMatchInlineSnapshot(`
@@ -2132,7 +2132,7 @@ describe("r2", () => {
fs.writeFileSync("wormhole-img.png", Buffer.alloc(TOO_BIG_FILE_SIZE));
await expect(
runWrangler(
`r2 object put bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
`r2 object put --remote bucketName-object-test/wormhole-img.png --file ./wormhole-img.png`
)
).rejects.toThrowErrorMatchingInlineSnapshot(`
[Error: Error: Wrangler only supports uploading files up to 300 MiB in size
@@ -2182,7 +2182,7 @@ describe("r2", () => {
"--ct content-type-mock --cd content-disposition-mock --ce content-encoding-mock --cl content-lang-mock --cc cache-control-mock --e expire-time-mock";

await runWrangler(
`r2 object put bucketName-object-test/wormhole-img.png ${flags} --file wormhole-img.png`
`r2 object put --remote bucketName-object-test/wormhole-img.png ${flags} --file wormhole-img.png`
);

expect(std.out).toMatchInlineSnapshot(`
@@ -2193,7 +2193,7 @@ describe("r2", () => {

it("should delete R2 object from bucket", async () => {
await runWrangler(
`r2 object delete bucketName-object-test/wormhole-img.png`
`r2 object delete --remote bucketName-object-test/wormhole-img.png`
);

expect(std.out).toMatchInlineSnapshot(`
@@ -2206,7 +2206,7 @@ describe("r2", () => {
fs.writeFileSync("wormhole-img.png", "passageway");
await expect(
runWrangler(
`r2 object put bucketName-object-test/wormhole-img.png --pipe --file wormhole-img.png`
`r2 object put --remote bucketName-object-test/wormhole-img.png --pipe --file wormhole-img.png`
)
).rejects.toThrowErrorMatchingInlineSnapshot(
`[Error: Arguments pipe and file are mutually exclusive]`

0 comments on commit 0d319cc

Please sign in to comment.