github-issue-tower-defence-management 1.161.0 → 1.162.0

package/src/adapter/entry-points/console/ui/e2e/consoleTestHarness.ts

@@ -379,6 +379,16 @@ const awaitingQualityCheckPullRequest: RelatedPullRequest = {
   missingRequiredCheckNames: ['build', 'test'],
 };
 
+const awaitingQualityCheckPullRequestMergeReady: RelatedPullRequest = {
+  ...awaitingQualityCheckPullRequest,
+  isConflicted: false,
+  mergeable: 'MERGEABLE',
+  isPassedAllCiJob: true,
+  isCiStateSuccess: true,
+  isBranchOutOfDate: false,
+  missingRequiredCheckNames: [],
+};
+
 const inlineCommentPullRequestDetail: PullRequestDetail = {
   title: 'Add inline review comments on the related pull request diff',
   state: 'open',
@@ -428,7 +438,7 @@ const createStubIssueRepository = (
     url: string,
   ): Promise<RelatedPullRequest | null> =>
     url === CONSOLE_E2E_AWAITING_QUALITY_CHECK_PR_URL
-      ? awaitingQualityCheckPullRequest
+      ? awaitingQualityCheckPullRequestMergeReady
       : null,
   getOpenPullRequestCiStatus: async (
     url: string,
@@ -457,7 +467,9 @@ const createStubIssueRepository = (
       ]),
     ),
   getPullRequestChangedFilePaths: async (): Promise<string[]> => [],
+  getAuthenticatedUserLogin: async (): Promise<string> => 'test-user',
   approvePullRequest: async (): Promise<void> => undefined,
+  mergePullRequest: async (): Promise<void> => undefined,
   requestChangesWithInlineComment: async (
     prUrl: string,
     changedFilePath: string | null,

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsoleOperationMenu.test.tsx

@@ -32,7 +32,7 @@ describe('ConsoleOperationMenu', () => {
         handlers={handlers}
       />,
     );
-    expect(getByText('Approve')).toBeInTheDocument();
+    expect(getByText('Approve & Merge')).toBeInTheDocument();
     expect(getByText('+1 day')).toBeInTheDocument();
     expect(getByText('Awaiting Workspace')).toBeInTheDocument();
     expect(getByText('Close')).toBeInTheDocument();
@@ -100,7 +100,7 @@ describe('ConsoleOperationMenu', () => {
         handlers={handlers}
       />,
     );
-    expect(queryByText('Approve')).toBeNull();
+    expect(queryByText('Approve & Merge')).toBeNull();
     expect(queryByText('Close')).not.toBeNull();
   });
 
@@ -121,7 +121,7 @@ describe('ConsoleOperationMenu', () => {
     expect(getByText('Close as not planned')).toBeInTheDocument();
     expect(getByText('+1 day')).toBeInTheDocument();
     expect(queryByText('Move to Okinawa')).toBeNull();
-    expect(queryByText('Approve')).toBeNull();
+    expect(queryByText('Approve & Merge')).toBeNull();
   });
 
   it('shows the review group on the workflow-blocker tab when the item has a pull request', () => {
@@ -136,7 +136,7 @@ describe('ConsoleOperationMenu', () => {
         handlers={handlers}
       />,
     );
-    expect(getByText('Approve')).toBeInTheDocument();
+    expect(getByText('Approve & Merge')).toBeInTheDocument();
     expect(getByText('Close')).toBeInTheDocument();
   });
 

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsolePullRequestReviewActions.test.tsx

@@ -13,7 +13,7 @@ describe('ConsolePullRequestReviewActions', () => {
       'Unnecessary',
       'Totally wrong',
       'Reject',
-      'Approve',
+      'Approve & Merge',
     ]);
   });
 
@@ -25,7 +25,7 @@ describe('ConsolePullRequestReviewActions', () => {
       />,
     );
     expect(getByText('Reject')).toBeDisabled();
-    expect(getByText('Approve')).not.toBeDisabled();
+    expect(getByText('Approve & Merge')).not.toBeDisabled();
     rerender(
       <ConsolePullRequestReviewActions
         onReview={() => {}}
@@ -82,12 +82,12 @@ describe('ConsolePullRequestReviewActions', () => {
     fireEvent.click(getByText('Unnecessary'));
     fireEvent.click(getByText('Totally wrong'));
     fireEvent.click(getByText('Reject'));
-    fireEvent.click(getByText('Approve'));
+    fireEvent.click(getByText('Approve & Merge'));
     expect(onReview.mock.calls.map((call) => call[0])).toEqual([
       'unnecessary',
       'totally_wrong',
       'request_changes',
-      'approve',
+      'approve_and_merge',
     ]);
   });
 });

package/src/adapter/entry-points/console/ui/src/features/console/components/operations/ConsolePullRequestReviewActions.tsx

@@ -13,7 +13,7 @@ const REVIEW_BUTTONS: {
   { action: 'unnecessary', label: 'Unnecessary', variant: 'unneeded' },
   { action: 'totally_wrong', label: 'Totally wrong', variant: 'wrong' },
   { action: 'request_changes', label: 'Reject', variant: 'reject' },
-  { action: 'approve', label: 'Approve', variant: 'approve' },
+  { action: 'approve_and_merge', label: 'Approve & Merge', variant: 'approve' },
 ];
 
 const REJECT_REQUIREMENT_MESSAGE =

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleOperations.test.ts

@@ -111,7 +111,7 @@ describe('useConsoleOperations', () => {
       await result.current.operations.reviewPullRequest(
         prItem,
         prItem.url,
-        'approve',
+        'approve_and_merge',
       );
     });
     const stored = JSON.parse(
@@ -362,7 +362,7 @@ describe('useConsoleOperations', () => {
       await result.current.operations.reviewPullRequest(
         prItem,
         prItem.url,
-        'approve',
+        'approve_and_merge',
       );
     });
     const key = `${prItem.repo}#${prItem.number}`;
@@ -410,7 +410,7 @@ describe('useConsoleOperations', () => {
       result.current.operations.reviewPullRequest(
         prItem,
         prItem.url,
-        'approve',
+        'approve_and_merge',
       ),
     ).rejects.toThrow('No project specified in the URL path.');
     expect(fetchMock).not.toHaveBeenCalled();

package/src/adapter/entry-points/console/ui/src/features/console/hooks/useConsoleOperations.ts

@@ -79,10 +79,10 @@ const reviewRequest = (
   action: ConsoleReviewAction,
   pendingReviewComments: ConsolePendingReviewComment[],
 ): ConsoleReviewRequest => {
-  if (action === 'approve') {
+  if (action === 'approve_and_merge') {
     return {
       pjcode,
-      action: 'approve',
+      action: 'approve_and_merge',
       prUrl,
       projectItemId: item.projectItemId,
     };

package/src/adapter/entry-points/console/ui/src/features/console/lib/consoleApi.test.ts

@@ -257,7 +257,7 @@ describe('postConsoleOperation', () => {
     const fetchMock = mockFetchOnce({ ok: true });
     await postConsoleOperation('/api/review', {
       pjcode: 'acme',
-      action: 'approve',
+      action: 'approve_and_merge',
       prUrl: 'https://github.com/o/r/pull/1',
       projectItemId: 'PVTI_1',
     });
@@ -269,7 +269,7 @@ describe('postConsoleOperation', () => {
   const failingReview = (): Promise<void> =>
     postConsoleOperation('/api/review', {
       pjcode: 'acme',
-      action: 'approve',
+      action: 'approve_and_merge',
       prUrl: 'https://github.com/o/r/pull/1',
       projectItemId: 'PVTI_1',
     });

package/src/adapter/entry-points/console/ui/src/features/console/logic/actionToast.test.ts

@@ -31,8 +31,11 @@ describe('itemToastLabel', () => {
 describe('actionToastMessage', () => {
   it('labels review actions', () => {
     expect(
-      actionToastMessage({ type: 'review', action: 'approve' }, 'prs'),
-    ).toBe('Approved');
+      actionToastMessage(
+        { type: 'review', action: 'approve_and_merge' },
+        'prs',
+      ),
+    ).toBe('Approved & Merged');
     expect(
       actionToastMessage({ type: 'review', action: 'request_changes' }, 'prs'),
     ).toBe('Rejected');
@@ -105,9 +108,9 @@ describe('actionToastMessage', () => {
 
 describe('actionToastColor', () => {
   it('colors each action group like the reference', () => {
-    expect(actionToastColor({ type: 'review', action: 'approve' })).toBe(
-      'green',
-    );
+    expect(
+      actionToastColor({ type: 'review', action: 'approve_and_merge' }),
+    ).toBe('green');
     expect(
       actionToastColor({ type: 'review', action: 'request_changes' }),
     ).toBe('amber');
@@ -129,9 +132,9 @@ describe('actionToastColor', () => {
 
 describe('actionAdvances', () => {
   it('advances every non-snooze action in every tab', () => {
-    expect(actionAdvances({ type: 'review', action: 'approve' }, 'prs')).toBe(
-      true,
-    );
+    expect(
+      actionAdvances({ type: 'review', action: 'approve_and_merge' }, 'prs'),
+    ).toBe(true);
     expect(actionAdvances({ type: 'set_status', optionName: 'x' }, 'prs')).toBe(
       true,
     );
@@ -151,7 +154,11 @@ describe('actionAdvances', () => {
 describe('formatActionToast', () => {
   it('combines the message and the item label', () => {
     expect(
-      formatActionToast({ type: 'review', action: 'approve' }, prItem, 'prs'),
-    ).toBe(`Approved — PR #${prItem.number}`);
+      formatActionToast(
+        { type: 'review', action: 'approve_and_merge' },
+        prItem,
+        'prs',
+      ),
+    ).toBe(`Approved & Merged — PR #${prItem.number}`);
   });
 });

package/src/adapter/entry-points/console/ui/src/features/console/logic/actionToast.ts

@@ -33,8 +33,8 @@ export const actionToastMessage = (
 ): string => {
   switch (kind.type) {
     case 'review':
-      if (kind.action === 'approve') {
-        return 'Approved';
+      if (kind.action === 'approve_and_merge') {
+        return 'Approved & Merged';
       }
       if (kind.action === 'request_changes') {
         return 'Rejected';
@@ -66,7 +66,7 @@ export const actionToastColor = (
 ): ConsoleToastColor => {
   switch (kind.type) {
     case 'review':
-      if (kind.action === 'approve') {
+      if (kind.action === 'approve_and_merge') {
         return 'green';
       }
       if (kind.action === 'request_changes') {

package/src/adapter/entry-points/console/ui/src/features/console/logic/operations.ts

@@ -22,7 +22,7 @@ export const buildRequestChangesBody = (
     .join('\n\n');
 
 export type ConsoleReviewAction =
-  | 'approve'
+  | 'approve_and_merge'
   | 'request_changes'
   | 'unnecessary'
   | 'totally_wrong';

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsoleItemDetailContainer.test.tsx

@@ -117,19 +117,19 @@ describe('ConsoleItemDetailContainer', () => {
       />,
     );
     await waitFor(() => {
-      expect(getByText('Approve')).toBeInTheDocument();
+      expect(getByText('Approve & Merge')).toBeInTheDocument();
     });
-    fireEvent.click(getByText('Approve'));
+    fireEvent.click(getByText('Approve & Merge'));
     expect(onQueueAction).toHaveBeenCalledTimes(1);
     const input = onQueueAction.mock.calls[0][0];
-    expect(input.kind).toEqual({ type: 'review', action: 'approve' });
+    expect(input.kind).toEqual({ type: 'review', action: 'approve_and_merge' });
     expect(input.item).toBe(prItem);
     expect(operations.reviewPullRequest).not.toHaveBeenCalled();
     input.commit();
     expect(operations.reviewPullRequest).toHaveBeenCalledWith(
       prItem,
       prItem.url,
-      'approve',
+      'approve_and_merge',
       [],
     );
   });
@@ -318,14 +318,14 @@ describe('ConsoleItemDetailContainer', () => {
       />,
     );
 
-    expect(getByText('Approve')).toBeInTheDocument();
-    fireEvent.click(getByText('Approve'));
+    expect(getByText('Approve & Merge')).toBeInTheDocument();
+    fireEvent.click(getByText('Approve & Merge'));
     const input = onQueueAction.mock.calls[0][0];
     input.commit();
     expect(operations.reviewPullRequest).toHaveBeenCalledWith(
       itemWithBakedPullRequest,
       bakedPullRequestUrl,
-      'approve',
+      'approve_and_merge',
       [],
     );
   });

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsolePage.test.tsx

@@ -124,7 +124,7 @@ describe('ConsolePage', () => {
       expect(getByText('Add serveConsole subcommand')).toBeInTheDocument();
     });
     fireEvent.click(getByText('Add serveConsole subcommand'));
-    expect(await findByText('Approve')).toBeInTheDocument();
+    expect(await findByText('Approve & Merge')).toBeInTheDocument();
     expect(queryByText('In Tmux by human')).toBeNull();
     const chip = container.querySelector('.console-detail-status-chip');
     expect(chip?.textContent).toBe('Awaiting Quality Check');
@@ -146,7 +146,7 @@ describe('ConsolePage', () => {
       expect(getByText('Add serveConsole subcommand')).toBeInTheDocument();
     });
     fireEvent.click(getByText('Add serveConsole subcommand'));
-    expect(await findByText('Approve')).toBeInTheDocument();
+    expect(await findByText('Approve & Merge')).toBeInTheDocument();
     expect(
       container.querySelector('.console-detail-status-chip')?.textContent,
     ).toBe('In Tmux by human');
@@ -158,7 +158,7 @@ describe('ConsolePage', () => {
       expect(getByText('Add serveConsole subcommand')).toBeInTheDocument();
     });
     fireEvent.click(getByText('Add serveConsole subcommand'));
-    expect(await findByText('Approve')).toBeInTheDocument();
+    expect(await findByText('Approve & Merge')).toBeInTheDocument();
     expect(window.location.hash).toBe('#item/PVTI_1');
   });
 
@@ -186,10 +186,10 @@ describe('ConsolePage', () => {
       ).toBe('1');
 
       fireEvent.click(getByText('Add serveConsole subcommand'));
-      expect(await findByText('Approve')).toBeInTheDocument();
-      fireEvent.click(getByText('Approve'));
+      expect(await findByText('Approve & Merge')).toBeInTheDocument();
+      fireEvent.click(getByText('Approve & Merge'));
 
-      expect(getByText('Approved — PR #851')).toBeInTheDocument();
+      expect(getByText('Approved & Merged — PR #851')).toBeInTheDocument();
       expect(getByText('Undo')).toBeInTheDocument();
       expect(
         within(tabBar())
@@ -242,8 +242,8 @@ describe('ConsolePage', () => {
         expect(getByText('Add serveConsole subcommand')).toBeInTheDocument();
       });
       fireEvent.click(getByText('Add serveConsole subcommand'));
-      expect(await findByText('Approve')).toBeInTheDocument();
-      fireEvent.click(getByText('Approve'));
+      expect(await findByText('Approve & Merge')).toBeInTheDocument();
+      fireEvent.click(getByText('Approve & Merge'));
 
       fireEvent.click(getByText('Undo'));
       act(() => {
@@ -486,7 +486,7 @@ describe('ConsolePage', () => {
         expect(getByText('Add serveConsole subcommand')).toBeInTheDocument();
       });
       fireEvent.click(getByText('Add serveConsole subcommand'));
-      fireEvent.click(await findByText('Approve'));
+      fireEvent.click(await findByText('Approve & Merge'));
 
       await act(async () => {
         jest.advanceTimersByTime(5100);
@@ -603,7 +603,7 @@ describe('ConsolePage swipe navigation', () => {
       expect(getByText('Add serveConsole subcommand')).toBeInTheDocument();
     });
     fireEvent.click(getByText('Add serveConsole subcommand'));
-    expect(await findByText('Approve')).toBeInTheDocument();
+    expect(await findByText('Approve & Merge')).toBeInTheDocument();
     expect(window.location.hash).toBe('#item/PVTI_1');
 
     const detailScreen = container.querySelector('.console-detail-screen');
@@ -627,7 +627,7 @@ describe('ConsolePage swipe navigation', () => {
       ).toBeInTheDocument();
     });
     fireEvent.click(getByText('Add server-side console API handlers'));
-    expect(await findByText('Approve')).toBeInTheDocument();
+    expect(await findByText('Approve & Merge')).toBeInTheDocument();
     expect(window.location.hash).toBe('#item/PVTI_2');
 
     const detailScreen = container.querySelector('.console-detail-screen');
@@ -673,10 +673,10 @@ describe('ConsolePage auto-advance', () => {
         expect(getByText('Add serveConsole subcommand')).toBeInTheDocument();
       });
       fireEvent.click(getByText('Add serveConsole subcommand'));
-      expect(await findByText('Approve')).toBeInTheDocument();
+      expect(await findByText('Approve & Merge')).toBeInTheDocument();
       expect(window.location.hash).toBe('#item/PVTI_1');
 
-      fireEvent.click(getByText('Approve'));
+      fireEvent.click(getByText('Approve & Merge'));
 
       await waitFor(() => {
         expect(window.location.hash).toBe('#item/PVTI_2');
@@ -717,7 +717,7 @@ describe('ConsolePage scroll reset', () => {
     });
 
     fireEvent.click(getByText('Add serveConsole subcommand'));
-    expect(await findByText('Approve')).toBeInTheDocument();
+    expect(await findByText('Approve & Merge')).toBeInTheDocument();
 
     expect(scrollTo).toHaveBeenCalledWith({ top: 0 });
   });
@@ -731,7 +731,7 @@ describe('ConsolePage scroll reset', () => {
     });
 
     fireEvent.click(getByText('Add serveConsole subcommand'));
-    expect(await findByText('Approve')).toBeInTheDocument();
+    expect(await findByText('Approve & Merge')).toBeInTheDocument();
     scrollTo.mockClear();
 
     const detailScreen = container.querySelector('.console-detail-screen');
@@ -800,7 +800,7 @@ describe('ConsolePage comment composer isolation', () => {
     });
 
     fireEvent.click(getByText('Add serveConsole subcommand'));
-    expect(await findByText('Approve')).toBeInTheDocument();
+    expect(await findByText('Approve & Merge')).toBeInTheDocument();
 
     fireEvent.change(getByPlaceholderText('Leave a comment…'), {
       target: { value: 'first item only comment' },
@@ -842,7 +842,7 @@ describe('ConsolePage auto-advance tab', () => {
       });
 
       fireEvent.click(getByText('Add serveConsole subcommand'));
-      fireEvent.click(await findByText('Approve'));
+      fireEvent.click(await findByText('Approve & Merge'));
 
       act(() => {
         jest.advanceTimersByTime(5100);