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
2 changes: 1 addition & 1 deletion src/webhook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export async function handleGithubEvent(event: string, payload: unknown, env: En
}

async function onRelease(e: ReleaseEvent, env: Env, cfg: Config): Promise<string> {
if (e.action !== "published" || e.release.draft || e.release.prerelease || !ours(cfg, e.repository)) {
if (e.action !== "released" || e.release.draft || e.release.prerelease || !ours(cfg, e.repository)) {
return "ignored release";
}
await sendMessage(env, env.CHANNEL_RELEASES, releaseMessage(e.repository.name, e.release));
Expand Down
2 changes: 1 addition & 1 deletion test/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ describe("POST /github", () => {
globalThis.fetch = (async () => new Response("nope", { status: 500 })) as typeof fetch;
const { ctx } = makeCtx();
const body = {
action: "published",
action: "released",
repository: { name: "toolbelt", owner: { login: "codercops" } },
release: { name: "v1", tag_name: "v1", body: "", html_url: "https://github.com/codercops/toolbelt/releases/tag/v1", draft: false, prerelease: false },
};
Expand Down
17 changes: 13 additions & 4 deletions test/webhook.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,20 +301,29 @@ describe("starter issue feed", () => {
describe("releases", () => {
const release = { name: "v0.6.2", tag_name: "v0.6.2", body: "Fixes", html_url: "https://github.com/codercops/toolbelt/releases/tag/v0.6.2", draft: false, prerelease: false };

it("posts published releases to the releases channel", async () => {
it("posts releases to the releases channel", async () => {
const fetched = mockFetch();
expect(await handleGithubEvent("release", { action: "published", repository, release }, env, cfg)).toBe("posted release");
expect(await handleGithubEvent("release", { action: "released", repository, release }, env, cfg)).toBe("posted release");
expect(fetched.discord()[0]?.url).toBe("https://discord.com/api/v10/channels/chan-releases/messages");
expect(fetched.discord()[0]?.body.embeds[0].title).toBe("toolbelt v0.6.2");
});

it("ignores drafts, prereleases and other actions", async () => {
const fetched = mockFetch();
await handleGithubEvent("release", { action: "created", repository, release }, env, cfg);
await handleGithubEvent("release", { action: "published", repository, release: { ...release, draft: true } }, env, cfg);
await handleGithubEvent("release", { action: "published", repository, release: { ...release, prerelease: true } }, env, cfg);
await handleGithubEvent("release", { action: "published", repository, release }, env, cfg);
await handleGithubEvent("release", { action: "released", repository, release: { ...release, draft: true } }, env, cfg);
await handleGithubEvent("release", { action: "released", repository, release: { ...release, prerelease: true } }, env, cfg);
expect(fetched.discord()).toHaveLength(0);
});

it("posts a prerelease once it's promoted to a full release", async () => {
const fetched = mockFetch();
await handleGithubEvent("release", { action: "published", repository, release: { ...release, prerelease: true } }, env, cfg);
await handleGithubEvent("release", { action: "edited", repository, release }, env, cfg);
expect(await handleGithubEvent("release", { action: "released", repository, release }, env, cfg)).toBe("posted release");
expect(fetched.discord()).toHaveLength(1);
});
});

describe("merged pull requests", () => {
Expand Down
Loading