fix missing test cases and bad rename

SamMorrowDrums · SamMorrowDrums · commit 70828156ac6c · 2025-05-23T12:31:50.000+02:00
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -1537,7 +1537,7 @@ func TestPullRequestReviewDeletion(t *testing.T) {
 	require.Len(t, noReviews, 0, "expected to find no reviews")
 }
 
-func ListNotifications(t *testing.T) {
+func TestListNotifications(t *testing.T) {
 	t.Parallel()
 	client := setupMCPClient(t)
 	ctx := context.Background()
@@ -1560,7 +1560,7 @@ func ListNotifications(t *testing.T) {
 	require.NoError(t, err, "expected to unmarshal text content successfully")
 }
 
-func ManageNotificationSubscription(t *testing.T) {
+func TestManageNotificationSubscription(t *testing.T) {
 	skipIfGlobalMutationNotOptedIn(t)
 	t.Parallel()
 	client := setupMCPClient(t)
@@ -1652,7 +1652,7 @@ func ManageNotificationSubscription(t *testing.T) {
 	require.Equal(t, 204, resp2.StatusCode)
 }
 
-func ManageRepositoryNotificationSubscription(t *testing.T) {
+func TestManageRepositoryNotificationSubscription(t *testing.T) {
 	skipIfGlobalMutationNotOptedIn(t)
 	t.Parallel()
 	client := setupMCPClient(t)
@@ -1730,7 +1730,7 @@ func ManageRepositoryNotificationSubscription(t *testing.T) {
 	require.Equal(t, 204, resp2.StatusCode)
 }
 
-func DismissNotification(t *testing.T) {
+func TestDismissNotification(t *testing.T) {
 	skipIfGlobalMutationNotOptedIn(t)
 	t.Parallel()
 	client := setupMCPClient(t)
@@ -1771,7 +1771,7 @@ func DismissNotification(t *testing.T) {
 	require.Contains(t, textContent.Text, "read")
 }
 
-func MarkAllNotificationsRead(t *testing.T) {
+func TestMarkAllNotificationsRead(t *testing.T) {
 	skipIfGlobalMutationNotOptedIn(t)
 	t.Parallel()
 	client := setupMCPClient(t)
@@ -1798,7 +1798,7 @@ func nowMinusOneHourRFC3339() string {
 	return time.Now().UTC().Add(-1 * time.Hour).Format(time.RFC3339)
 }
 
-func GetNotificationDetails(t *testing.T) {
+func TestGetNotificationDetails(t *testing.T) {
 	t.Parallel()
 	client := setupMCPClient(t)
 	ctx := context.Background()
diff --git a/pkg/github/notifications_test.go b/pkg/github/notifications_test.go
@@ -291,16 +291,18 @@ func Test_ManageRepositoryNotificationSubscription(t *testing.T) {
 	assert.ElementsMatch(t, tool.InputSchema.Required, []string{"owner", "repo", "action"})
 
 	mockSub := &github.Subscription{Ignored: github.Ptr(true)}
+	mockWatchSub := &github.Subscription{Ignored: github.Ptr(false), Subscribed: github.Ptr(true)}
 
 	tests := []struct {
-		name           string
-		mockedClient   *http.Client
-		requestArgs    map[string]interface{}
-		expectError    bool
-		expectIgnored  *bool
-		expectDeleted  bool
-		expectInvalid  bool
-		expectedErrMsg string
+		name             string
+		mockedClient     *http.Client
+		requestArgs      map[string]interface{}
+		expectError      bool
+		expectIgnored    *bool
+		expectSubscribed *bool
+		expectDeleted    bool
+		expectInvalid    bool
+		expectedErrMsg   string
 	}{
 		{
 			name: "ignore subscription",
@@ -318,6 +320,23 @@ func Test_ManageRepositoryNotificationSubscription(t *testing.T) {
 			expectError:   false,
 			expectIgnored: github.Ptr(true),
 		},
+		{
+			name: "watch subscription",
+			mockedClient: mock.NewMockedHTTPClient(
+				mock.WithRequestMatch(
+					mock.PutReposSubscriptionByOwnerByRepo,
+					mockWatchSub,
+				),
+			),
+			requestArgs: map[string]interface{}{
+				"owner":  "owner",
+				"repo":   "repo",
+				"action": "watch",
+			},
+			expectError:      false,
+			expectIgnored:    github.Ptr(false),
+			expectSubscribed: github.Ptr(true),
+		},
 		{
 			name: "delete subscription",
 			mockedClient: mock.NewMockedHTTPClient(
@@ -400,11 +419,16 @@ func Test_ManageRepositoryNotificationSubscription(t *testing.T) {
 
 			require.NoError(t, err)
 			textContent := getTextResult(t, result)
-			if tc.expectIgnored != nil {
+			if tc.expectIgnored != nil || tc.expectSubscribed != nil {
 				var returned github.Subscription
 				err = json.Unmarshal([]byte(textContent.Text), &returned)
 				require.NoError(t, err)
-				assert.Equal(t, *tc.expectIgnored, *returned.Ignored)
+				if tc.expectIgnored != nil {
+					assert.Equal(t, *tc.expectIgnored, *returned.Ignored)
+				}
+				if tc.expectSubscribed != nil {
+					assert.Equal(t, *tc.expectSubscribed, *returned.Subscribed)
+				}
 			}
 			if tc.expectDeleted {
 				assert.Contains(t, textContent.Text, "deleted")
