Split mock back out, use RepositoryCommit with Files/Stats

jshorty · jshorty · commit 6122f7c9541e · 2025-04-10T18:14:20.000Z
diff --git a/pkg/github/repositories.go b/pkg/github/repositories.go
@@ -76,7 +76,6 @@ func getCommit(client *github.Client, t translations.TranslationHelperFunc) (too
 		}
 }
 
-
 // listCommits creates a tool to get commits of a branch in a repository.
 func listCommits(client *github.Client, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) {
 	return mcp.NewTool("list_commits",
diff --git a/pkg/github/repositories_test.go b/pkg/github/repositories_test.go
@@ -15,39 +15,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var mockCommits = []*github.RepositoryCommit{
-	{
-		SHA: github.Ptr("abc123def456"),
-		Commit: &github.Commit{
-			Message: github.Ptr("First commit"),
-			Author: &github.CommitAuthor{
-				Name:  github.Ptr("Test User"),
-				Email: github.Ptr("test@example.com"),
-				Date:  &github.Timestamp{Time: time.Now().Add(-48 * time.Hour)},
-			},
-		},
-		Author: &github.User{
-			Login: github.Ptr("testuser"),
-		},
-		HTMLURL: github.Ptr("https://github.com/owner/repo/commit/abc123def456"),
-	},
-	{
-		SHA: github.Ptr("def456abc789"),
-		Commit: &github.Commit{
-			Message: github.Ptr("Second commit"),
-			Author: &github.CommitAuthor{
-				Name:  github.Ptr("Another User"),
-				Email: github.Ptr("another@example.com"),
-				Date:  &github.Timestamp{Time: time.Now().Add(-24 * time.Hour)},
-			},
-		},
-		Author: &github.User{
-			Login: github.Ptr("anotheruser"),
-		},
-		HTMLURL: github.Ptr("https://github.com/owner/repo/commit/def456abc789"),
-	},
-}
-
 func Test_GetFileContents(t *testing.T) {
 	// Verify tool definition once
 	mockClient := github.NewClient(nil)
@@ -520,7 +487,36 @@ func Test_GetCommit(t *testing.T) {
 	assert.Contains(t, tool.InputSchema.Properties, "sha")
 	assert.ElementsMatch(t, tool.InputSchema.Required, []string{"owner", "repo", "sha"})
 
-	mockCommit := mockCommits[0]
+	mockCommit := &github.RepositoryCommit{
+		SHA: github.Ptr("abc123def456"),
+		Commit: &github.Commit{
+			Message: github.Ptr("First commit"),
+			Author: &github.CommitAuthor{
+				Name:  github.Ptr("Test User"),
+				Email: github.Ptr("test@example.com"),
+				Date:  &github.Timestamp{Time: time.Now().Add(-48 * time.Hour)},
+			},
+		},
+		Author: &github.User{
+			Login: github.Ptr("testuser"),
+		},
+		HTMLURL: github.Ptr("https://github.com/owner/repo/commit/abc123def456"),
+		Stats: &github.CommitStats{
+			Additions: github.Ptr(10),
+			Deletions: github.Ptr(2),
+			Total:     github.Ptr(12),
+		},
+		Files: []*github.CommitFile{
+			{
+				Filename:  github.Ptr("file1.go"),
+				Status:    github.Ptr("modified"),
+				Additions: github.Ptr(10),
+				Deletions: github.Ptr(2),
+				Changes:   github.Ptr(12),
+				Patch:     github.Ptr("@@ -1,2 +1,10 @@"),
+			},
+		},
+	}
 	// This one currently isn't defined in the mock package we're using.
 	var mockEndpointPattern = mock.EndpointPattern{
 		Pattern: "/repos/{owner}/{repo}/commits/{sha}",
@@ -600,7 +596,7 @@ func Test_GetCommit(t *testing.T) {
 			var returnedCommit github.RepositoryCommit
 			err = json.Unmarshal([]byte(textContent.Text), &returnedCommit)
 			require.NoError(t, err)
-			
+
 			assert.Equal(t, *tc.expectedCommit.SHA, *returnedCommit.SHA)
 			assert.Equal(t, *tc.expectedCommit.Commit.Message, *returnedCommit.Commit.Message)
 			assert.Equal(t, *tc.expectedCommit.Author.Login, *returnedCommit.Author.Login)
@@ -622,7 +618,41 @@ func Test_ListCommits(t *testing.T) {
 	assert.Contains(t, tool.InputSchema.Properties, "page")
 	assert.Contains(t, tool.InputSchema.Properties, "perPage")
 	assert.ElementsMatch(t, tool.InputSchema.Required, []string{"owner", "repo"})
-	
+
+	// Setup mock commits for success case
+	mockCommits := []*github.RepositoryCommit{
+		{
+			SHA: github.Ptr("abc123def456"),
+			Commit: &github.Commit{
+				Message: github.Ptr("First commit"),
+				Author: &github.CommitAuthor{
+					Name:  github.Ptr("Test User"),
+					Email: github.Ptr("test@example.com"),
+					Date:  &github.Timestamp{Time: time.Now().Add(-48 * time.Hour)},
+				},
+			},
+			Author: &github.User{
+				Login: github.Ptr("testuser"),
+			},
+			HTMLURL: github.Ptr("https://github.com/owner/repo/commit/abc123def456"),
+		},
+		{
+			SHA: github.Ptr("def456abc789"),
+			Commit: &github.Commit{
+				Message: github.Ptr("Second commit"),
+				Author: &github.CommitAuthor{
+					Name:  github.Ptr("Another User"),
+					Email: github.Ptr("another@example.com"),
+					Date:  &github.Timestamp{Time: time.Now().Add(-24 * time.Hour)},
+				},
+			},
+			Author: &github.User{
+				Login: github.Ptr("anotheruser"),
+			},
+			HTMLURL: github.Ptr("https://github.com/owner/repo/commit/def456abc789"),
+		},
+	}
+
 	tests := []struct {
 		name            string
 		mockedClient    *http.Client

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ func getCommit(client *github.Client, t translations.TranslationHelperFunc) (too`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`-`
`80`	`79`	`// listCommits creates a tool to get commits of a branch in a repository.`
`81`	`80`	`func listCommits(client *github.Client, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) {`
`82`	`81`	`return mcp.NewTool("list_commits",`