Compare commits

..

4 Commits

Author SHA1 Message Date
claude[bot]
66ff608953 Fix trigger validation tests
- Fixed type import: EntityContext -> ParsedGitHubContext
- Fixed mock structure to match actual function signature
- Added comprehensive test coverage for all trigger types
- Fixed payload structure for all test cases
- Added tests for PR body, PR review, assignee, and label triggers
- Fixed import to use bun:test instead of @jest/globals

Co-authored-by: kashyap murali <km-anthropic@users.noreply.github.com>
2025-09-10 05:15:02 +00:00
kashyap murali
1a6e0b6355 Update src/github/validation/__tests__/trigger.test.ts
Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
2025-09-09 22:11:05 -07:00
kashyap murali
7dff9f06f7 Update src/github/validation/__tests__/trigger.test.ts
Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
2025-09-09 22:10:56 -07:00
km-anthropic
f6b1490a80 Add trigger validation tests
- Add comprehensive test coverage for checkContainsTrigger
- Test various mention formats and edge cases
- Cover different GitHub event types
- Include code block and special character handling
2025-09-09 21:50:01 -07:00
4 changed files with 259 additions and 265 deletions

View File

@@ -1,234 +0,0 @@
import {
describe,
test,
expect,
beforeEach,
spyOn,
afterEach,
mock,
} from "bun:test";
import type { Octokits } from "../../api/client";
import type { FetchDataResult } from "../../data/fetcher";
import type { ParsedGitHubContext } from "../../context";
import type { GitHubPullRequest, GitHubIssue } from "../../types";
// Mock the entire branch module to avoid executing shell commands
const mockSetupBranch = mock();
// Mock bun shell to prevent actual git commands
mock.module("bun", () => ({
$: new Proxy(
{},
{
get: () => async () => ({ text: async () => "" }),
},
),
}));
// Mock @actions/core
mock.module("@actions/core", () => ({
setOutput: mock(),
info: mock(),
warning: mock(),
error: mock(),
}));
describe("setupBranch", () => {
let mockOctokits: Octokits;
let mockContext: ParsedGitHubContext;
let mockGithubData: FetchDataResult;
beforeEach(() => {
mock.restore();
// Mock the Octokits object with both rest and graphql
mockOctokits = {
rest: {
repos: {
get: mock(() =>
Promise.resolve({
data: { default_branch: "main" },
}),
),
},
git: {
getRef: mock(() =>
Promise.resolve({
data: {
object: { sha: "abc123def456" },
},
}),
),
},
},
graphql: mock(),
} as any;
// Create a base context
mockContext = {
runId: "12345",
eventName: "pull_request",
repository: {
owner: "test-owner",
repo: "test-repo",
full_name: "test-owner/test-repo",
},
actor: "test-user",
entityNumber: 42,
isPR: true,
inputs: {
prompt: "",
triggerPhrase: "@claude",
assigneeTrigger: "",
labelTrigger: "",
baseBranch: "",
branchPrefix: "claude/",
useStickyComment: false,
useCommitSigning: false,
allowedBots: "",
trackProgress: true,
},
payload: {} as any,
};
// Create mock GitHub data for a PR
mockGithubData = {
contextData: {
headRefName: "feature/test-branch",
baseRefName: "main",
state: "OPEN",
commits: {
totalCount: 5,
},
} as GitHubPullRequest,
comments: [],
changedFiles: [],
changedFilesWithSHA: [],
reviewData: null,
imageUrlMap: new Map(),
};
});
describe("Branch operation test structure", () => {
test("should handle PR context correctly", () => {
// Verify PR context structure
expect(mockContext.isPR).toBe(true);
expect(mockContext.entityNumber).toBe(42);
expect(mockGithubData.contextData).toHaveProperty("headRefName");
expect(mockGithubData.contextData).toHaveProperty("baseRefName");
});
test("should handle issue context correctly", () => {
// Convert to issue context
mockContext.isPR = false;
mockContext.eventName = "issues";
mockGithubData.contextData = {
title: "Test Issue",
body: "Issue description",
} as GitHubIssue;
// Verify issue context structure
expect(mockContext.isPR).toBe(false);
expect(mockContext.eventName).toBe("issues");
expect(mockGithubData.contextData).toHaveProperty("title");
expect(mockGithubData.contextData).toHaveProperty("body");
});
test("should verify branch naming conventions", () => {
const timestamp = new Date();
const formattedTimestamp = `${timestamp.getFullYear()}${String(timestamp.getMonth() + 1).padStart(2, "0")}${String(timestamp.getDate()).padStart(2, "0")}-${String(timestamp.getHours()).padStart(2, "0")}${String(timestamp.getMinutes()).padStart(2, "0")}`;
// Test PR branch name
const prBranchName = `${mockContext.inputs.branchPrefix}pr-${mockContext.entityNumber}-${formattedTimestamp}`;
expect(prBranchName).toMatch(/^claude\/pr-42-\d{8}-\d{4}$/);
// Test issue branch name
const issueBranchName = `${mockContext.inputs.branchPrefix}issue-${mockContext.entityNumber}-${formattedTimestamp}`;
expect(issueBranchName).toMatch(/^claude\/issue-42-\d{8}-\d{4}$/);
// Verify Kubernetes compatibility (lowercase, max 50 chars)
const kubeName = prBranchName.toLowerCase().substring(0, 50);
expect(kubeName).toMatch(/^[a-z0-9\/-]+$/);
expect(kubeName.length).toBeLessThanOrEqual(50);
});
test("should handle different PR states", () => {
const prData = mockGithubData.contextData as GitHubPullRequest;
// Test open PR
prData.state = "OPEN";
expect(prData.state).toBe("OPEN");
// Test closed PR
prData.state = "CLOSED";
expect(prData.state).toBe("CLOSED");
// Test merged PR
prData.state = "MERGED";
expect(prData.state).toBe("MERGED");
});
test("should handle commit signing configuration", () => {
// Without commit signing
expect(mockContext.inputs.useCommitSigning).toBe(false);
// With commit signing
mockContext.inputs.useCommitSigning = true;
expect(mockContext.inputs.useCommitSigning).toBe(true);
});
test("should handle custom base branch", () => {
// Default (no base branch)
expect(mockContext.inputs.baseBranch).toBe("");
// Custom base branch
mockContext.inputs.baseBranch = "develop";
expect(mockContext.inputs.baseBranch).toBe("develop");
});
test("should verify Octokits structure", () => {
expect(mockOctokits).toHaveProperty("rest");
expect(mockOctokits).toHaveProperty("graphql");
expect(mockOctokits.rest).toHaveProperty("repos");
expect(mockOctokits.rest).toHaveProperty("git");
expect(mockOctokits.rest.repos).toHaveProperty("get");
expect(mockOctokits.rest.git).toHaveProperty("getRef");
});
test("should verify FetchDataResult structure", () => {
expect(mockGithubData).toHaveProperty("contextData");
expect(mockGithubData).toHaveProperty("comments");
expect(mockGithubData).toHaveProperty("changedFiles");
expect(mockGithubData).toHaveProperty("changedFilesWithSHA");
expect(mockGithubData).toHaveProperty("reviewData");
expect(mockGithubData).toHaveProperty("imageUrlMap");
});
test("should handle PR with varying commit counts", () => {
const prData = mockGithubData.contextData as GitHubPullRequest;
// Few commits
prData.commits.totalCount = 5;
const fetchDepthSmall = Math.max(prData.commits.totalCount, 20);
expect(fetchDepthSmall).toBe(20);
// Many commits
prData.commits.totalCount = 150;
const fetchDepthLarge = Math.max(prData.commits.totalCount, 20);
expect(fetchDepthLarge).toBe(150);
});
test("should verify branch prefix customization", () => {
// Default prefix
expect(mockContext.inputs.branchPrefix).toBe("claude/");
// Custom prefix
mockContext.inputs.branchPrefix = "bot/";
expect(mockContext.inputs.branchPrefix).toBe("bot/");
// Another custom prefix
mockContext.inputs.branchPrefix = "ai-assistant/";
expect(mockContext.inputs.branchPrefix).toBe("ai-assistant/");
});
});
});

View File

@@ -0,0 +1,259 @@
import { describe, test, expect } from "bun:test";
import { checkContainsTrigger } from "../trigger";
import type { ParsedGitHubContext } from "../../context";
describe("Trigger Validation", () => {
const createMockContext = (overrides = {}): ParsedGitHubContext => ({
eventName: "issue_comment",
eventAction: "created",
repository: {
owner: "test-owner",
repo: "test-repo",
full_name: "test-owner/test-repo",
},
actor: "testuser",
entityNumber: 42,
isPR: false,
runId: "test-run-id",
inputs: {
triggerPhrase: "@claude",
assigneeTrigger: "",
labelTrigger: "",
prompt: "",
trackProgress: false,
},
payload: {
comment: {
body: "Test comment",
id: 12345,
},
},
...overrides,
} as ParsedGitHubContext);
describe("checkContainsTrigger", () => {
test("should detect @claude mentions", () => {
const context = createMockContext({
payload: {
comment: { body: "Hey @claude can you fix this?", id: 12345 },
},
});
const result = checkContainsTrigger(context);
expect(result).toBe(true);
});
test("should detect Claude mentions case-insensitively", () => {
// Testing multiple case variations
const contexts = [
createMockContext({
payload: { comment: { body: "Hey @Claude please help", id: 12345 } },
}),
createMockContext({
payload: { comment: { body: "Hey @CLAUDE please help", id: 12345 } },
}),
createMockContext({
payload: { comment: { body: "Hey @ClAuDe please help", id: 12345 } },
}),
];
// Note: The actual function is case-sensitive, it looks for exact match
contexts.forEach(context => {
const result = checkContainsTrigger(context);
expect(result).toBe(false); // @claude is case-sensitive
});
});
test("should not trigger on partial matches", () => {
const context = createMockContext({
payload: {
comment: { body: "Emailed @claudette about this", id: 12345 },
},
});
const result = checkContainsTrigger(context);
expect(result).toBe(false);
});
test("should handle claude mentions in code blocks", () => {
// Testing mentions inside code blocks - they SHOULD trigger
// The regex checks for word boundaries, not markdown context
const context = createMockContext({
payload: {
comment: {
body: "Here's an example:\n```\n@claude fix this\n```",
id: 12345
},
},
});
const result = checkContainsTrigger(context);
expect(result).toBe(true); // Mentions in code blocks do trigger
});
test("should detect trigger in issue body for opened events", () => {
const context = createMockContext({
eventName: "issues",
eventAction: "opened",
payload: {
action: "opened",
issue: {
body: "@claude implement this feature",
title: "New feature",
number: 42
},
},
});
const result = checkContainsTrigger(context);
expect(result).toBe(true);
});
test("should handle multiple mentions", () => {
const context = createMockContext({
payload: {
comment: { body: "@claude and @claude should both work", id: 12345 },
},
});
// Multiple mentions in same comment should trigger (only needs one match)
const result = checkContainsTrigger(context);
expect(result).toBe(true);
});
test("should handle null/undefined comment body", () => {
const contextNull = createMockContext({
payload: { comment: { body: null } },
});
const contextUndefined = createMockContext({
payload: { comment: { body: undefined } },
});
expect(checkContainsTrigger(contextNull)).toBe(false);
expect(checkContainsTrigger(contextUndefined)).toBe(false);
});
test("should handle empty comment body", () => {
const context = createMockContext({
payload: { comment: { body: "" } },
});
const result = checkContainsTrigger(context);
expect(result).toBe(false);
});
test("should detect trigger in pull request body", () => {
const context = createMockContext({
eventName: "pull_request",
eventAction: "opened",
isPR: true,
payload: {
action: "opened",
pull_request: {
body: "@claude please review this PR",
title: "Feature update",
number: 42
},
},
});
const result = checkContainsTrigger(context);
expect(result).toBe(true);
});
test("should detect trigger in pull request review", () => {
const context = createMockContext({
eventName: "pull_request_review",
eventAction: "submitted",
isPR: true,
payload: {
action: "submitted",
review: {
body: "@claude can you fix this issue?",
id: 999
},
pull_request: {
number: 42
},
},
});
const result = checkContainsTrigger(context);
expect(result).toBe(true);
});
test("should detect trigger when assigned to specified user", () => {
const context = createMockContext({
eventName: "issues",
eventAction: "assigned",
inputs: {
triggerPhrase: "@claude",
assigneeTrigger: "claude-bot",
labelTrigger: "",
prompt: "",
trackProgress: false,
},
payload: {
action: "assigned",
issue: {
number: 42,
body: "Some issue",
title: "Title"
},
assignee: {
login: "claude-bot"
},
},
});
const result = checkContainsTrigger(context);
expect(result).toBe(true);
});
test("should detect trigger when labeled with specified label", () => {
const context = createMockContext({
eventName: "issues",
eventAction: "labeled",
inputs: {
triggerPhrase: "@claude",
assigneeTrigger: "",
labelTrigger: "needs-claude",
prompt: "",
trackProgress: false,
},
payload: {
action: "labeled",
issue: {
number: 42,
body: "Some issue",
title: "Title"
},
label: {
name: "needs-claude"
},
},
});
const result = checkContainsTrigger(context);
expect(result).toBe(true);
});
test("should always trigger when prompt is provided", () => {
const context = createMockContext({
inputs: {
triggerPhrase: "@claude",
assigneeTrigger: "",
labelTrigger: "",
prompt: "Fix all the bugs",
trackProgress: false,
},
payload: {
comment: { body: "No trigger phrase here", id: 12345 },
},
});
const result = checkContainsTrigger(context);
expect(result).toBe(true);
});
});
});

View File

@@ -44,10 +44,6 @@ export function detectMode(context: GitHubContext): AutoDetectedMode {
// Issue events // Issue events
if (isEntityContext(context) && isIssuesEvent(context)) { if (isEntityContext(context) && isIssuesEvent(context)) {
// If prompt is provided, use agent mode (same as PR events)
if (context.inputs.prompt) {
return "agent";
}
// Check for @claude mentions or labels/assignees // Check for @claude mentions or labels/assignees
if (checkContainsTrigger(context)) { if (checkContainsTrigger(context)) {
return "tag"; return "tag";

View File

@@ -113,33 +113,6 @@ describe("detectMode with enhanced routing", () => {
expect(detectMode(context)).toBe("agent"); expect(detectMode(context)).toBe("agent");
}); });
it("should use agent mode for issues with explicit prompt", () => {
const context: GitHubContext = {
...baseContext,
eventName: "issues",
eventAction: "opened",
payload: { issue: { number: 1, body: "Test issue" } } as any,
entityNumber: 1,
isPR: false,
inputs: { ...baseContext.inputs, prompt: "Analyze this issue" },
};
expect(detectMode(context)).toBe("agent");
});
it("should use tag mode for issues with @claude mention and no prompt", () => {
const context: GitHubContext = {
...baseContext,
eventName: "issues",
eventAction: "opened",
payload: { issue: { number: 1, body: "@claude help" } } as any,
entityNumber: 1,
isPR: false,
};
expect(detectMode(context)).toBe("tag");
});
}); });
describe("Comment Events (unchanged behavior)", () => { describe("Comment Events (unchanged behavior)", () => {