Skip to content
TypeScript

fix(gitcafe): PR link previews show a GitHub-merged pull request as merged (#29595)

Alex Southwell5349ecb06c19
diff --git a/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts b/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts
index 113a388e853..cb2bf219c0b 100644
--- a/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts
+++ b/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts
@@ -1103,6 +1103,8 @@ describe("GitCafePullRequestProvider", () => {
const detail = yield* provider.getChangeRequest(target);
assert.strictEqual(detail.state, "merged");
assert.strictEqual(detail.mergedAt, mergedAt);
+ const preview = yield* provider.getChangeRequestPreview!(target);
+ assert.strictEqual(preview.state, "merged");
}).pipe(Effect.provide(server.layer));
});
diff --git a/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts b/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts
index e87a4e154d6..7f8b4bab29d 100644
--- a/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts
+++ b/packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts
@@ -897,7 +897,7 @@ export const make = Effect.gen(function* () {
),
getChangeRequestPreview: (input) =>
readPull("getChangeRequestPreview", input).pipe(
- Effect.map((pull) => Json.toChangeRequest(pull, input)),
+ Effect.map((pull) => ({ ...Json.toChangeRequest(pull, input), ...settledMerge(pull) })),
),
getChangeRequestSummary: Effect.fn("GitCafePullRequestProvider.getChangeRequestSummary")(
function* (input) {