@openmrs/esm-openconceptlab-app 4.3.1-pre.534 → 4.3.1-pre.559

package/src/previous-imports/import-overview/import-items.test.tsx

@@ -1,6 +1,8 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import { screen, waitFor } from '@testing-library/react';
-import { usePagination } from '@openmrs/esm-framework';
+import { type FetchResponse, usePagination } from '@openmrs/esm-framework';
+import { type ImportItem } from '../../types';
 import { renderWithSwr } from '@tools/test-helpers';
 import { mockImportItems, mockPreviousImports } from '@mocks/openconceptlab.mock';
 import { getImportDetails } from './import-items.resource';
@@ -10,26 +12,30 @@ const defaultProps = {
   importUuid: mockPreviousImports[1].uuid,
 };
 
-const mockGetImportDetails = getImportDetails as jest.Mock;
-const mockUsePagination = usePagination as jest.Mock;
+const mockGetImportDetails = vi.mocked(getImportDetails);
+const mockUsePagination = vi.mocked(usePagination);
 
-jest.mock('./import-items.resource', () => {
-  const originalModule = jest.requireActual('./import-items.resource');
+vi.mock('./import-items.resource', async () => {
+  const originalModule = (await vi.importActual('./import-items.resource')) as object;
 
   return {
     ...originalModule,
-    getImportDetails: jest.fn(),
+    getImportDetails: vi.fn(),
   };
 });
 
 describe('Import items', () => {
   it('renders a tabular overview', async () => {
-    mockGetImportDetails.mockReturnValue({ status: 200, ok: true, data: mockImportItems });
+    mockGetImportDetails.mockResolvedValue({
+      status: 200,
+      ok: true,
+      data: mockImportItems,
+    } as unknown as FetchResponse<{ results: ImportItem[] }>);
     mockUsePagination.mockReturnValue({
       currentPage: 1,
       goTo: () => {},
       results: mockImportItems,
-    });
+    } as unknown as ReturnType<typeof usePagination>);
     renderWithSwr(<ImportItems {...defaultProps} />);
     await waitForLoadingToFinish();
 
@@ -38,12 +44,16 @@ describe('Import items', () => {
   });
 
   it('renders the import items correctly', async () => {
-    mockGetImportDetails.mockReturnValue({ status: 200, ok: true, data: mockImportItems });
+    mockGetImportDetails.mockResolvedValue({
+      status: 200,
+      ok: true,
+      data: mockImportItems,
+    } as unknown as FetchResponse<{ results: ImportItem[] }>);
     mockUsePagination.mockReturnValue({
       currentPage: 1,
       goTo: () => {},
       results: mockImportItems,
-    });
+    } as unknown as ReturnType<typeof usePagination>);
     renderWithSwr(<ImportItems {...defaultProps} />);
     await waitForLoadingToFinish();
 

package/src/previous-imports/import-overview/import-overview.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { describe, it, expect } from 'vitest';
 import { screen, waitFor } from '@testing-library/react';
 import { formatDatetime } from '@openmrs/esm-framework';
 import { renderWithSwr } from '@tools/test-helpers';

package/src/previous-imports/previous-imports.test.tsx

@@ -1,21 +1,22 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import { screen, waitFor } from '@testing-library/react';
-import { formatDatetime, openmrsFetch, usePagination } from '@openmrs/esm-framework';
+import { type FetchResponse, formatDatetime, openmrsFetch, usePagination } from '@openmrs/esm-framework';
 import { renderWithSwr } from '@tools/test-helpers';
 import { mockPreviousImports } from '@mocks/openconceptlab.mock';
 import PreviousImports from './previous-imports.component';
 
-const mockOpenmrsFetch = openmrsFetch as jest.Mock;
-const mockUsePagination = usePagination as jest.Mock;
+const mockOpenmrsFetch = vi.mocked(openmrsFetch);
+const mockUsePagination = vi.mocked(usePagination);
 
 describe('Previous imports', () => {
   it('renders the table', async () => {
-    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
+    mockOpenmrsFetch.mockResolvedValueOnce({ data: { results: [] } } as unknown as FetchResponse);
     mockUsePagination.mockReturnValue({
       currentPage: 1,
       goTo: () => {},
       results: [],
-    });
+    } as unknown as ReturnType<typeof usePagination>);
     renderWithSwr(<PreviousImports />);
     await waitForLoadingToFinish();
 
@@ -26,12 +27,12 @@ describe('Previous imports', () => {
   });
 
   it('renders the previous imports correctly', async () => {
-    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: mockPreviousImports } });
+    mockOpenmrsFetch.mockResolvedValueOnce({ data: { results: mockPreviousImports } } as unknown as FetchResponse);
     mockUsePagination.mockReturnValue({
       currentPage: 1,
       goTo: () => {},
       results: mockPreviousImports,
-    });
+    } as unknown as ReturnType<typeof usePagination>);
     renderWithSwr(<PreviousImports />);
     await waitForLoadingToFinish();
 

package/src/root.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { describe, it, expect } from 'vitest';
 import { render, screen } from '@testing-library/react';
 import Root from './root.component';
 

package/src/subscription/subscription.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { screen, waitFor } from '@testing-library/react';
 import { type FetchResponse, openmrsFetch, showNotification } from '@openmrs/esm-framework';
@@ -7,34 +8,34 @@ import { mockSubscription } from '@mocks/openconceptlab.mock';
 import { deleteSubscription, updateSubscription } from './subscription.resource';
 import Subscription from './subscription.component';
 
-const mockOpenmrsFetch = openmrsFetch as jest.Mock;
-const mockUpdateSubscription = jest.mocked(updateSubscription);
-const mockDeleteSubscription = jest.mocked(deleteSubscription);
-const mockShowNotification = jest.mocked(showNotification);
+const mockOpenmrsFetch = vi.mocked(openmrsFetch);
+const mockUpdateSubscription = vi.mocked(updateSubscription);
+const mockDeleteSubscription = vi.mocked(deleteSubscription);
+const mockShowNotification = vi.mocked(showNotification);
 
-jest.mock('./subscription.resource', () => {
-  const originalModule = jest.requireActual('./subscription.resource');
+vi.mock('./subscription.resource', async () => {
+  const originalModule = (await vi.importActual('./subscription.resource')) as object;
 
   return {
     ...originalModule,
-    updateSubscription: jest.fn(),
-    deleteSubscription: jest.fn(),
+    updateSubscription: vi.fn(),
+    deleteSubscription: vi.fn(),
   };
 });
 
 describe('Subscription component', () => {
   it('renders the empty forms', async () => {
-    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
+    mockOpenmrsFetch.mockResolvedValueOnce({ data: { results: [] } } as unknown as FetchResponse);
     renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
 
     expect(screen.getByText('Setup Subscription')).toBeVisible();
     expect(screen.getByRole('heading', { name: 'Unsubscribe' })).toBeVisible();
-    expect(screen.getByRole('button', { name: 'danger Unsubscribe' })).toBeDisabled();
+    expect(screen.getByRole('button', { name: /danger\s*Unsubscribe/i })).toBeDisabled();
   });
 
   it('renders the subscription if a subscription exists', async () => {
-    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [mockSubscription] } });
+    mockOpenmrsFetch.mockResolvedValueOnce({ data: { results: [mockSubscription] } } as unknown as FetchResponse);
     renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
     await waitForLoadingSubscription();
@@ -45,12 +46,12 @@ describe('Subscription component', () => {
     expect(
       screen.getByLabelText('Disable validation (should be used with care for well curated collections or sources)'),
     ).not.toBeChecked();
-    expect(screen.getByRole('button', { name: 'danger Unsubscribe' })).toBeEnabled();
+    expect(screen.getByRole('button', { name: /danger\s*Unsubscribe/i })).toBeEnabled();
   });
 
-  xit('allows adding a new subscription', async () => {
+  it.skip('allows adding a new subscription', async () => {
     const user = userEvent.setup();
-    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
+    mockOpenmrsFetch.mockResolvedValueOnce({ data: { results: [] } } as unknown as FetchResponse);
     renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
 
@@ -79,9 +80,9 @@ describe('Subscription component', () => {
     expect(mockShowNotification).toHaveBeenCalledTimes(1);
   });
 
-  xit('allows changing the saved subscription', async () => {
+  it.skip('allows changing the saved subscription', async () => {
     const user = userEvent.setup();
-    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [mockSubscription] } });
+    mockOpenmrsFetch.mockResolvedValueOnce({ data: { results: [mockSubscription] } } as unknown as FetchResponse);
     renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
     await waitForLoadingSubscription();
@@ -117,14 +118,14 @@ describe('Subscription component', () => {
     expect(mockShowNotification).toHaveBeenCalledTimes(1);
   });
 
-  xit('allows removing the saved subscription', async () => {
+  it.skip('allows removing the saved subscription', async () => {
     const user = userEvent.setup();
-    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [mockSubscription] } });
+    mockOpenmrsFetch.mockResolvedValueOnce({ data: { results: [mockSubscription] } } as unknown as FetchResponse);
     renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
     await waitForLoadingSubscription();
 
-    const unsubscribeButton = screen.getByRole('button', { name: 'danger Unsubscribe' });
+    const unsubscribeButton = screen.getByRole('button', { name: /danger\s*Unsubscribe/i });
 
     mockDeleteSubscription.mockResolvedValueOnce({ status: 204 } as unknown as FetchResponse);
 

package/vitest.config.ts

@@ -0,0 +1,4 @@
+import { mergeConfig } from 'vitest/config';
+import sharedConfig from '../../tools/vitest.shared';
+
+export default mergeConfig(sharedConfig, {});