fix AutoRefresh.spec.tsx, OAuthConnectFreeDb.spec.tsx

Author: pd-redis

redisinsight/ui/src/components/auto-refresh/AutoRefresh.spec.tsx

@@ -63,7 +63,7 @@ describe('AutoRefresh', () => {
     render(<AutoRefresh {...instance(mockedProps)} onRefresh={onRefresh} />)
 
     fireEvent.click(screen.getByTestId('refresh-btn'))
-    expect(onRefresh).toBeCalled()
+    expect(onRefresh).toHaveBeenCalled()
   })
 
   it('refresh text should contain "Last refresh" time with disabled auto-refresh', async () => {
@@ -170,22 +170,23 @@ describe('AutoRefresh', () => {
       })
       expect(screen.getByTestId(INLINE_ITEM_EDITOR)).toHaveValue('1')
 
-      screen.getByTestId(/apply-btn/).click()
+      await userEvent.click(screen.getByTestId(/apply-btn/))
+      // screen.getByTestId(/apply-btn/).click()
 
       await act(async () => {
         await new Promise((r) => setTimeout(r, 1300))
       })
-      expect(onRefresh).toBeCalledTimes(1)
+      expect(onRefresh).toHaveBeenCalledTimes(1)
 
       await act(async () => {
         await new Promise((r) => setTimeout(r, 1300))
       })
-      expect(onRefresh).toBeCalledTimes(2)
+      expect(onRefresh).toHaveBeenCalledTimes(2)
 
       await act(async () => {
         await new Promise((r) => setTimeout(r, 1300))
       })
-      expect(onRefresh).toBeCalledTimes(3)
+      expect(onRefresh).toHaveBeenCalledTimes(3)
     })
 
     it('should respect minimumRefreshRate when setting refresh rate', async () => {
@@ -279,7 +280,7 @@ describe('AutoRefresh', () => {
 
     screen.getByTestId(/apply-btn/).click()
 
-    await act(() => {
+    await act(async () => {
       rerender(
         <AutoRefresh
           {...instance(mockedProps)}
@@ -292,14 +293,14 @@ describe('AutoRefresh', () => {
     await act(async () => {
       await new Promise((r) => setTimeout(r, 1300))
     })
-    expect(onRefresh).toBeCalledTimes(0)
+    expect(onRefresh).toHaveBeenCalledTimes(0)
 
     await act(async () => {
       await new Promise((r) => setTimeout(r, 1300))
     })
-    expect(onRefresh).toBeCalledTimes(0)
+    expect(onRefresh).toHaveBeenCalledTimes(0)
 
-    await act(() => {
+    await act(async () => {
       rerender(
         <AutoRefresh
           {...instance(mockedProps)}
@@ -312,7 +313,7 @@ describe('AutoRefresh', () => {
     await act(async () => {
       await new Promise((r) => setTimeout(r, 1300))
     })
-    expect(onRefresh).toBeCalledTimes(1)
+    expect(onRefresh).toHaveBeenCalledTimes(1)
   })
 
   it('refresh tooltip text should contain disabled refresh button reason message when button disabled', async () => {

redisinsight/ui/src/components/oauth/oauth-connect-free-db/OAuthConnectFreeDb.spec.tsx

@@ -1,12 +1,6 @@
 import React from 'react'
 import { cloneDeep } from 'lodash'
-import {
-  act,
-  cleanup,
-  fireEvent,
-  mockedStore,
-  render,
-} from 'uiSrc/utils/test-utils'
+import { cleanup, mockedStore, render, userEvent } from 'uiSrc/utils/test-utils'
 import {
   getRedisModulesSummary,
   sendEventTelemetry,
@@ -15,6 +9,7 @@ import {
 import {
   freeInstancesSelector,
   setDefaultInstance,
+  setDefaultInstanceSuccess,
 } from 'uiSrc/slices/instances/instances'
 import { OAuthSocialSource } from 'uiSrc/slices/interfaces'
 import { setCapability } from 'uiSrc/slices/app/context'
@@ -63,10 +58,8 @@ describe('OAuthConnectFreeDb', () => {
 
     const { queryByTestId } = render(<OAuthConnectFreeDb id="providedId" />)
 
-    await act(() =>
-      fireEvent.click(
-        queryByTestId('connect-free-db-btn') as HTMLButtonElement,
-      ),
+    await userEvent.click(
+      queryByTestId('connect-free-db-btn') as HTMLButtonElement,
     )
 
     expect(sendEventTelemetry).toHaveBeenCalledWith({
@@ -86,6 +79,7 @@ describe('OAuthConnectFreeDb', () => {
         tutorialPopoverShown: false,
       }),
       setDefaultInstance(),
+      setDefaultInstanceSuccess(),
     ]
     expect(store.getActions()).toEqual(expectedActions)
   })

redisinsight/ui/src/mocks/handlers/instances/instancesHandlers.ts

@@ -1,12 +1,9 @@
 import { http, HttpHandler, HttpResponse } from 'msw'
-import { RedisNodeInfoResponse } from 'src/modules/database/dto/redis-info.dto'
 import { ApiEndpoints } from 'uiSrc/constants'
 import { ConnectionType, Instance } from 'uiSrc/slices/interfaces'
 import { getMswURL } from 'uiSrc/utils/test-utils'
 import { getUrl } from 'uiSrc/utils'
 import { MOCK_INFO_API_RESPONSE } from 'uiSrc/mocks/data/instances'
-import { Database as DatabaseInstanceResponse } from 'apiSrc/modules/database/models/database'
-import { ExportDatabase } from 'apiSrc/modules/database/models/export-database'
 
 export const INSTANCE_ID_MOCK = 'instanceId'
 export const INSTANCES_MOCK: Instance[] = [
@@ -78,29 +75,23 @@ export const getDatabasesApiSpy = jest
 
 const handlers: HttpHandler[] = [
   // fetchInstancesAction
-  http.get<any, DatabaseInstanceResponse[]>(
-    getMswURL(ApiEndpoints.DATABASES),
-    getDatabasesApiSpy,
-  ),
-  http.post<any, ExportDatabase>(
-    getMswURL(ApiEndpoints.DATABASES_EXPORT),
-    async () => {
-      return HttpResponse.json(INSTANCES_MOCK, { status: 200 })
-    },
-  ),
-  http.get<any, DatabaseInstanceResponse>(
-    getMswURL(getUrl(INSTANCE_ID_MOCK)),
-    async () => {
-      return HttpResponse.json(INSTANCES_MOCK[0], { status: 200 })
-    },
-  ),
-  http.get<any, RedisNodeInfoResponse>(
+  http.get(getMswURL(ApiEndpoints.DATABASES), getDatabasesApiSpy),
+  http.post(getMswURL(ApiEndpoints.DATABASES_EXPORT), async () => {
+    return HttpResponse.json(INSTANCES_MOCK, { status: 200 })
+  }),
+  http.get(getMswURL(getUrl(INSTANCE_ID_MOCK)), async () => {
+    return HttpResponse.json(INSTANCES_MOCK[0], { status: 200 })
+  }),
+  http.get(
     getMswURL(`/${ApiEndpoints.DATABASES}/:id/info`),
     // getMswURL(getUrl(INSTANCE_ID_MOCK, 'info')),
     async () => {
       return HttpResponse.json(MOCK_INFO_API_RESPONSE, { status: 200 })
     },
   ),
+  http.get(getMswURL(`${ApiEndpoints.DATABASES}/:id/connect`), async () => {
+    return HttpResponse.text('', { status: 200 })
+  }),
 ]
 
 // rest.post(`${ApiEndpoints.INSTANCE}`, (req, res, ctx) => {