Skip to content

Commit 4884e29

Browse files
committed
fix(source-control): retain gitcafe totals only for complete file coverage
1 parent 61f831d commit 4884e29

2 files changed

Lines changed: 34 additions & 13 deletions

File tree

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.test.ts‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,14 @@ describe("GitCafePullRequestProvider", () => {
842842
}).pipe(Effect.provide(server.layer));
843843
});
844844

845-
it.effect.each(["changes", "diff-files", "partial-changes", "partial-diff-files"] as const)(
845+
it.effect.each([
846+
"changes",
847+
"diff-files",
848+
"partial-changes",
849+
"partial-diff-files",
850+
"omitted-diff-files",
851+
"oversized-file",
852+
] as const)(
846853
"retries line stats after a failed or incomplete %s read and retains the complete retry",
847854
(failedRead) => {
848855
const snapshot = { version: 4, headOid, comparisonBaseOid: baseOid };
@@ -866,6 +873,9 @@ describe("GitCafePullRequestProvider", () => {
866873
...(failedRead === "partial-changes"
867874
? [{ path: "image.png", binary: true }]
868875
: []),
876+
...(failedRead === "oversized-file"
877+
? [{ path: "large.ts", ...(recovered ? { binary: true } : { tooLarge: true }) }]
878+
: []),
869879
],
870880
next: null,
871881
},
@@ -874,22 +884,32 @@ describe("GitCafePullRequestProvider", () => {
874884
? {}
875885
: {
876886
...snapshot,
877-
items: [
878-
{
879-
path: "file.ts",
880-
additions: 5,
881-
...(!recovered && failedRead === "partial-diff-files" ? {} : { deletions: 2 }),
882-
},
883-
],
887+
items:
888+
!recovered && failedRead === "omitted-diff-files"
889+
? []
890+
: [
891+
{
892+
path: "file.ts",
893+
additions: 5,
894+
...(!recovered && failedRead === "partial-diff-files"
895+
? {}
896+
: { deletions: 2 }),
897+
},
898+
],
884899
},
885900
});
886901
return Effect.gen(function* () {
887902
const provider = yield* GitCafePullRequestProvider.make;
888903
const firstReadStart = server.sent.length;
889904
assert.deepInclude(yield* provider.getChangeRequest(target), {
890-
additions: failedRead.startsWith("partial-") ? 5 : 0,
891-
deletions: 0,
892-
changedFiles: failedRead === "changes" ? 0 : failedRead === "partial-changes" ? 2 : 1,
905+
additions: failedRead.startsWith("partial-") || failedRead === "oversized-file" ? 5 : 0,
906+
deletions: failedRead === "oversized-file" ? 2 : 0,
907+
changedFiles:
908+
failedRead === "changes"
909+
? 0
910+
: failedRead === "partial-changes" || failedRead === "oversized-file"
911+
? 2
912+
: 1,
893913
});
894914
assert.strictEqual(
895915
server.sent.length - firstReadStart,
@@ -901,7 +921,8 @@ describe("GitCafePullRequestProvider", () => {
901921
assert.deepInclude(yield* provider.getChangeRequest(target), {
902922
additions: 5,
903923
deletions: 2,
904-
changedFiles: failedRead === "partial-changes" ? 2 : 1,
924+
changedFiles:
925+
failedRead === "partial-changes" || failedRead === "oversized-file" ? 2 : 1,
905926
});
906927
assert.strictEqual(
907928
server.sent.length - readStart,

‎packages/source-control-gitcafe/src/server/GitCafePullRequestProvider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ export const make = Effect.gen(function* () {
443443
complete:
444444
Option.isSome(details) &&
445445
after === null &&
446-
counted.every(
446+
withDetails(files, counted).every(
447447
(file) => file.binary || (file.additions !== undefined && file.deletions !== undefined),
448448
),
449449
changedFiles: files.length,

0 commit comments

Comments
 (0)