fix: abort not happend in unit tests

Signed-off-by: Lin Wang <wonglam@amazon.com>
opensearch-project · Dec 8, 2023 · c7ca9b2 · c7ca9b2
1 parent 61f8cc9
commit c7ca9b2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/public/components/__tests__/edit_conversation_name_modal.test.tsx b/public/components/__tests__/edit_conversation_name_modal.test.tsx
@@ -14,6 +14,7 @@ import {
   EditConversationNameModal,
   EditConversationNameModalProps,
 } from '../edit_conversation_name_modal';
+import { HttpHandler } from '../../../../../src/core/public';
 
 const setup = ({ onClose, defaultTitle, sessionId }: EditConversationNameModalProps) => {
   const useCoreMock = {
@@ -142,15 +143,20 @@ describe('<EditConversationNameModal />', () => {
 
   it('should call onClose with cancelled after patch session aborted', async () => {
     const onCloseMock = jest.fn();
-    const pendingPromise = new Promise((resolve) => {
-      setTimeout(resolve, 99999);
-    });
     const { renderResult, useCoreMock } = setup({
       sessionId: '1',
       defaultTitle: 'foo',
       onClose: onCloseMock,
     });
-    useCoreMock.services.http.put.mockImplementation(() => pendingPromise);
+    useCoreMock.services.http.put.mockImplementation(((_path, options) => {
+      return new Promise((_resolve, reject) => {
+        if (options?.signal) {
+          options.signal.onabort = () => {
+            reject(new Error('Aborted'));
+          };
+        }
+      });
+    }) as HttpHandler);
 
     act(() => {
       fireEvent.change(renderResult.getByLabelText('Conversation name input'), {

diff --git a/public/tabs/history/__tests__/delete_conversation_confirm_modal.test.tsx b/public/tabs/history/__tests__/delete_conversation_confirm_modal.test.tsx
@@ -14,6 +14,7 @@ import {
   DeleteConversationConfirmModal,
   DeleteConversationConfirmModalProps,
 } from '../delete_conversation_confirm_modal';
+import { HttpHandler } from '../../../../../../src/core/public';
 
 const setup = ({ onClose, sessionId }: DeleteConversationConfirmModalProps) => {
   const useCoreMock = {
@@ -52,7 +53,7 @@ describe('<DeleteConversationConfirmModal />', () => {
 
   it('should call onClose with "canceled" after cancel button click', async () => {
     const onCloseMock = jest.fn();
-    const { renderResult, useCoreMock } = setup({
+    const { renderResult } = setup({
       sessionId: '1',
       onClose: onCloseMock,
     });
@@ -111,14 +112,19 @@ describe('<DeleteConversationConfirmModal />', () => {
 
   it('should call onClose with cancelled after delete session aborted', async () => {
     const onCloseMock = jest.fn();
-    const pendingPromise = new Promise((resolve) => {
-      setTimeout(resolve, 99999);
-    });
     const { renderResult, useCoreMock } = setup({
       sessionId: '1',
       onClose: onCloseMock,
     });
-    useCoreMock.services.http.delete.mockImplementation(() => pendingPromise);
+    useCoreMock.services.http.delete.mockImplementation(((_path, options) => {
+      return new Promise((_resolve, reject) => {
+        if (options?.signal) {
+          options.signal.onabort = () => {
+            reject(new Error('Aborted'));
+          };
+        }
+      });
+    }) as HttpHandler);
 
     expect(onCloseMock).not.toHaveBeenCalled();
     expect(useCoreMock.services.http.delete).not.toHaveBeenCalled();