Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/beige-llamas-punch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cloudflare/vitest-pool-workers": patch
---

fix test filtering by pattern that contains non-ascii characters.
15 changes: 15 additions & 0 deletions packages/miniflare/src/workers/core/devalue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ export const structuredSerializableReducers: ReducersRevivers = {
];
}
},
RegExp(value) {
if (value instanceof RegExp) {
const { source, flags } = value;
const encoded = Buffer.from(source).toString("base64");
return flags ? ["RegExp", encoded, flags] : ["RegExp", encoded];
}
},
Error(value) {
for (const ctor of ALLOWED_ERROR_CONSTRUCTORS) {
if (value instanceof ctor && value.name === ctor.name) {
Expand Down Expand Up @@ -97,6 +104,14 @@ export const structuredSerializableRevivers: ReducersRevivers = {
if ("BYTES_PER_ELEMENT" in ctor) length /= ctor.BYTES_PER_ELEMENT;
return new ctor(buffer as ArrayBuffer, byteOffset, length);
},
RegExp(value) {
assert(Array.isArray(value));
const [name, encoded, flags] = value;
assert(typeof name === "string");
assert(typeof encoded === "string");
const source = Buffer.from(encoded, "base64").toString("utf-8");
return new RegExp(source, flags);
},
Error(value) {
assert(Array.isArray(value));
const [name, message, stack, cause] = value as unknown[];
Expand Down
26 changes: 26 additions & 0 deletions packages/miniflare/test/workers/core/serialize.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import test from "ava";
import { parse, stringify } from "devalue";
import {
structuredSerializableReducers,
structuredSerializableRevivers,
} from "miniflare";

test("serialize RegExp object consisting of only ascii chars", (t) => {
const input = new RegExp(/HelloWorld/);

const serialized = stringify(input, structuredSerializableReducers);
t.is(serialized, '[["RegExp",1],[2,3],"RegExp","SGVsbG9Xb3JsZA=="]');

const deserialized = parse(serialized, structuredSerializableRevivers);
t.deepEqual(deserialized, input);
});

test("serialize RegExp object containing non-ascii chars", (t) => {
const input = new RegExp(/こんにちは/);

const serialized = stringify(input, structuredSerializableReducers);
t.is(serialized, '[["RegExp",1],[2,3],"RegExp","44GT44KT44Gr44Gh44Gv"]');

const deserialized = parse(serialized, structuredSerializableRevivers);
t.deepEqual(deserialized, input);
});
29 changes: 29 additions & 0 deletions packages/vitest-pool-workers/test/filtering.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import dedent from "ts-dedent";
import { minimalVitestConfig, test } from "./helpers";

test("filter test suite by pattern includes non-ascii string", async ({
expect,
seed,
vitestRun,
}) => {
await seed({
"vitest.config.mts": minimalVitestConfig,
"index.test.ts": dedent`
import { it, expect } from "vitest";

it("test includes 日本語", async () => {
expect(1).toBe(1)
});

it("test not includes 日本語", async () => {
expect(1).toBe(2)
});
`,
});

const result = await vitestRun({
flags: ["--testNamePattern='test includes 日本語'"],
});

expect(await result.exitCode).toBe(0);
});
Loading