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/upstream/ruleset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ async function validateRecordedGitHubIssue(repo: string, token: string, report:
const issue = (await response.json()) as { number?: number; html_url?: string; state?: string; body?: string | null; labels?: Array<string | { name?: string }> };
if (issue.number !== report.issueNumber || !issue.html_url || issue.state !== "open") return null;
if (!issue.body?.includes(`gittensory-upstream-drift:${report.fingerprint}`)) return null;
if (!issue.labels?.some((label) => (typeof label === "string" ? label : label.name) === "signals")) return null;
if (!issue.labels?.some((label) => (typeof label === "string" ? label : label.name)?.toLowerCase() === "signals")) return null;
const issueUrl = parseGitHubIssueUrl(issue.html_url);
if (!issueUrl || issueUrl.number !== report.issueNumber) return null;
if (issueUrl.owner.toLowerCase() !== owner.toLowerCase() || issueUrl.name.toLowerCase() !== name.toLowerCase()) return null;
Expand Down
14 changes: 14 additions & 0 deletions test/unit/upstream-ruleset.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,19 @@ describe("upstream ruleset drift tracking", () => {
);
await expect(fileUpstreamDriftIssues(objectLabelLinkedEnv)).resolves.toMatchObject({ status: "completed", created: 0, updated: 1, skipped: 0 });

// GitHub labels are case-insensitive: a repo whose "signals" label is stored with different casing
// (e.g. "Signals") must still be recognized as the recorded drift issue, so it is updated, not duplicated.
const caseVariantLabelEnv = createTestEnv({ GITTENSORY_AUTO_FILE_DRIFT_ISSUES: "true", GITTENSORY_DRIFT_ISSUE_TOKEN: "token" });
await upsertUpstreamDriftReport(caseVariantLabelEnv, driftReport("case-variant-label-linked", { issueNumber: 139, issueUrl: "https://github.com/JSONbored/gittensory/issues/139" }));
vi.stubGlobal(
"fetch",
githubIssueFetch({
issue: { number: 139, url: "https://github.com/JSONbored/gittensory/issues/139", fingerprint: "case-variant-label-linked", labels: [{ name: "Signals" }] },
update: { number: 139, url: "https://github.com/JSONbored/gittensory/issues/139" },
}),
);
await expect(fileUpstreamDriftIssues(caseVariantLabelEnv)).resolves.toMatchObject({ status: "completed", created: 0, updated: 1, skipped: 0 });

const staleLinkedEnv = createTestEnv({ GITTENSORY_AUTO_FILE_DRIFT_ISSUES: "true", GITTENSORY_DRIFT_ISSUE_TOKEN: "token", GITTENSORY_DRIFT_ISSUE_REPO: "victim/current-repo" });
await upsertUpstreamDriftReport(staleLinkedEnv, driftReport("stale-linked", { issueNumber: 123, issueUrl: "https://github.com/other-owner/old-repo/issues/123" }));
const staleLinkedCalls: GitHubIssueFetchCall[] = [];
Expand Down Expand Up @@ -1012,6 +1025,7 @@ describe("upstream ruleset drift tracking", () => {
{ fingerprint: "closed-linked", issueNumber: 135, issueUrl: "https://github.com/JSONbored/gittensory/issues/135", issue: { number: 135, url: "https://github.com/JSONbored/gittensory/issues/135", fingerprint: "closed-linked", state: "closed" } },
{ fingerprint: "missing-body-linked", issueNumber: 136, issueUrl: "https://github.com/JSONbored/gittensory/issues/136", issue: { number: 136, url: "https://github.com/JSONbored/gittensory/issues/136", fingerprint: "missing-body-linked", body: null } },
{ fingerprint: "missing-label-linked", issueNumber: 137, issueUrl: "https://github.com/JSONbored/gittensory/issues/137", issue: { number: 137, url: "https://github.com/JSONbored/gittensory/issues/137", fingerprint: "missing-label-linked", labels: [{ name: "triage" }] } },
{ fingerprint: "nameless-label-linked", issueNumber: 141, issueUrl: "https://github.com/JSONbored/gittensory/issues/141", issue: { number: 141, url: "https://github.com/JSONbored/gittensory/issues/141", fingerprint: "nameless-label-linked", labels: [{}] } },
{ fingerprint: "returned-url-linked", issueNumber: 138, issueUrl: "https://github.com/JSONbored/gittensory/issues/138", issue: { number: 138, url: "https://github.com/other/repo/issues/138", fingerprint: "returned-url-linked" } },
]) {
const rejectedLinkedEnv = createTestEnv({ GITTENSORY_AUTO_FILE_DRIFT_ISSUES: "true", GITTENSORY_DRIFT_ISSUE_TOKEN: "token" });
Expand Down
Loading