Skip to content
Draft
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
4 changes: 3 additions & 1 deletion packages/deploy-helpers/src/triggers/publish-routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ export function renderRoute(route: Route): string {
if (isCustomDomain) {
const flags: string[] = [];
if ("enabled" in route && route.enabled !== undefined) {
flags.push(route.enabled ? "enabled" : "disabled");
flags.push(
route.enabled ? "production: enabled" : "production: disabled"
);
}
if ("previews_enabled" in route && route.previews_enabled !== undefined) {
flags.push(
Expand Down
66 changes: 66 additions & 0 deletions packages/deploy-helpers/tests/publish-routes.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import { describe, it } from "vitest";
import { renderRoute } from "../src/triggers/publish-routes";
import type { Route } from "@cloudflare/workers-utils";

describe("renderRoute", () => {
it.for([
{ enabled: true, expected: "production: enabled" },
{ enabled: false, expected: "production: disabled" },
])(
"renders an explicit production value",
({ enabled, expected }, { expect }) => {
expect(
renderRoute({ pattern: "example.com", custom_domain: true, enabled })
).toBe(`example.com (custom domain) [${expected}]`);
}
);

it.for([
{ previews_enabled: true, expected: "previews: enabled" },
{ previews_enabled: false, expected: "previews: disabled" },
])(
"renders an explicit Preview value",
({ previews_enabled, expected }, { expect }) => {
expect(
renderRoute({
pattern: "example.com",
custom_domain: true,
previews_enabled,
})
).toBe(`example.com (custom domain) [${expected}]`);
}
);

it("omits unspecified values", ({ expect }) => {
expect(renderRoute({ pattern: "example.com", custom_domain: true })).toBe(
"example.com (custom domain)"
);
});

it("renders production and Preview values together", ({ expect }) => {
expect(
renderRoute({
pattern: "example.com",
custom_domain: true,
enabled: false,
previews_enabled: true,
})
).toBe(
"example.com (custom domain) [production: disabled, previews: enabled]"
);
});

it.for<{ route: Route; expected: string }>([
{ route: "example.com/*", expected: "example.com/*" },
{
route: { pattern: "example.com/*", zone_id: "zone-id" },
expected: "example.com/* (zone id: zone-id)",
},
{
route: { pattern: "example.com/*", zone_name: "example.com" },
expected: "example.com/* (zone name: example.com)",
},
])("preserves non-custom route output", ({ route, expected }, { expect }) => {
expect(renderRoute(route)).toBe(expected);
});
});
2 changes: 1 addition & 1 deletion packages/wrangler/src/__tests__/deploy/routes.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ describe("deploy", () => {
});
await runWrangler("deploy ./index");
expect(std.out).toContain("api.example.com (custom domain)");
expect(std.out).toContain("[enabled, previews: enabled]");
expect(std.out).toContain("[production: enabled, previews: enabled]");
});

it("should confirm override if custom domain deploy would override an existing domain", async ({
Expand Down
Loading