Skip to content

Commit 15b0306

Browse files
committed
fixups
1 parent 4204d20 commit 15b0306

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

packages/vite-plugin-cloudflare/e2e/remote-bindings.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe
1919
)
2020
// Note: the reload test applies changes to the fixture files, so we do want the
2121
// tests to run sequentially in order to avoid race conditions
22-
.sequential("remote binding tests", () => {
22+
.sequential("remote bindings tests", () => {
2323
const remoteWorkerName = "tmp-e2e-vite-plugin-mixed-mode-remote-worker";
2424
const alternativeRemoteWorkerName =
2525
"tmp-e2e-vite-plugin-mixed-mode-remote-worker-alt";

packages/wrangler/e2e/dev-remote-bindings.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ describe("wrangler dev - remote bindings", () => {
1616
const helper = new WranglerE2ETestHelper();
1717

1818
beforeAll(async () => {
19-
await helper.seed(resolve(__dirname, "./seed-files/mixed-mode-workers"));
19+
await helper.seed(
20+
resolve(__dirname, "./seed-files/remote-binding-workers")
21+
);
2022

2123
await helper.seed({
2224
"remote-worker.js": dedent/* javascript */ `

packages/wrangler/e2e/miniflare-remote-resources.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,9 @@ async function runTestCase<T>(
432432
const { experimental_startRemoteProxySession } =
433433
await helper.importWrangler();
434434
const { Miniflare } = await helper.importMiniflare();
435-
await helper.seed(path.resolve(__dirname, "./seed-files/mixed-mode-workers"));
435+
await helper.seed(
436+
path.resolve(__dirname, "./seed-files/remote-binding-workers")
437+
);
436438
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
437439
const setupResult = (await testCase.setup?.(helper))!;
438440

packages/wrangler/e2e/start-worker-remote-bindings.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ describe("startWorker - remote bindings", () => {
1111
const helper = new WranglerE2ETestHelper();
1212

1313
beforeAll(async () => {
14-
await helper.seed(resolve(__dirname, "./seed-files/mixed-mode-workers"));
14+
await helper.seed(
15+
resolve(__dirname, "./seed-files/remote-binding-workers")
16+
);
1517
await helper.seed({
1618
"remote-worker.js": dedent/* javascript */ `
1719
export default {

packages/wrangler/e2e/wrangler-remote-resources.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type TestCase<T = void> = {
2424
generateWranglerConfig: (setupResult: T) => RawConfig;
2525
expectedResponseMatch: string | RegExp;
2626
// Flag for resources that can work without remote bindings opt-in
27-
worksWithoutMixedMode?: boolean;
27+
worksWithoutRemoteBindings?: boolean;
2828
};
2929

3030
const testCases: TestCase<Record<string, string>>[] = [
@@ -107,7 +107,7 @@ const testCases: TestCase<Record<string, string>>[] = [
107107
}),
108108
expectedResponseMatch: "This is a response from Workers AI",
109109
// AI bindings work without opt in flag flag
110-
worksWithoutMixedMode: true,
110+
worksWithoutRemoteBindings: true,
111111
},
112112
{
113113
name: "Browser",
@@ -136,8 +136,8 @@ const testCases: TestCase<Record<string, string>>[] = [
136136
},
137137
}),
138138
expectedResponseMatch: "image/avif",
139-
// The Images binding "works" without opt in flag because the current default is an older mixed-mode-style implementation
140-
worksWithoutMixedMode: true,
139+
// The Images binding "works" without opt in flag because the current default is an older remote binding implementation
140+
worksWithoutRemoteBindings: true,
141141
},
142142
{
143143
name: "Vectorize",
@@ -297,7 +297,7 @@ describe("Wrangler Mixed Mode E2E Tests", () => {
297297

298298
it("works with remote bindings enabled", async () => {
299299
await helper.seed(
300-
path.resolve(__dirname, "./seed-files/mixed-mode-workers")
300+
path.resolve(__dirname, "./seed-files/remote-binding-workers")
301301
);
302302

303303
await writeWranglerConfig(testCase, helper);
@@ -310,13 +310,13 @@ describe("Wrangler Mixed Mode E2E Tests", () => {
310310
expect(response).toMatch(testCase.expectedResponseMatch);
311311
});
312312

313-
it.skipIf(testCase.worksWithoutMixedMode)(
313+
it.skipIf(testCase.worksWithoutRemoteBindings)(
314314
"fails when remote bindings is disabled",
315315
// Turn off retries because this test is expected to fail
316316
{ retry: 0, fails: true },
317317
async () => {
318318
await helper.seed(
319-
path.resolve(__dirname, "./seed-files/mixed-mode-workers")
319+
path.resolve(__dirname, "./seed-files/remote-binding-workers")
320320
);
321321

322322
await writeWranglerConfig(testCase, helper);
@@ -342,7 +342,7 @@ describe("Wrangler Mixed Mode E2E Tests", () => {
342342
beforeAll(async () => {
343343
helper = new WranglerE2ETestHelper();
344344
await helper.seed(
345-
path.resolve(__dirname, "./seed-files/mixed-mode-workers")
345+
path.resolve(__dirname, "./seed-files/remote-binding-workers")
346346
);
347347

348348
await helper.seed({

0 commit comments

Comments
 (0)