Replace rendering with events with react testing library by vitest-browser-react

test/servers/helpers/DuplicatedServersModal.test.tsx

@@ -1,5 +1,4 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { page } from 'vitest/browser';
 import type { ServerData } from '../../../src/servers/data';
 import { DuplicatedServersModal } from '../../../src/servers/helpers/DuplicatedServersModal';
 import { checkAccessibility } from '../../__helpers__/accessibility';
@@ -22,8 +21,8 @@ describe('<DuplicatedServersModal />', () => {
     [[mockServer(), mockServer()], 2],
     [[mockServer(), mockServer(), mockServer()], 3],
     [[mockServer(), mockServer(), mockServer(), mockServer()], 4],
-  ])('renders expected amount of items', (duplicatedServers, expectedItems) => {
-    setUp(duplicatedServers);
+  ])('renders expected amount of items', async (duplicatedServers, expectedItems) => {
+    const page = await setUp(duplicatedServers);
     expect(page.getByRole('listitem')).toHaveLength(expectedItems);
   });
 
@@ -49,7 +48,7 @@ describe('<DuplicatedServersModal />', () => {
       },
     ],
   ])('renders expected texts based on amount of servers', async (duplicatedServers, assertions) => {
-    setUp(duplicatedServers);
+    const page = await setUp(duplicatedServers);
 
     await expect.element(page.getByRole('heading')).toHaveTextContent(assertions.header);
     await expect.element(page.getByText(assertions.firstParagraph)).toBeInTheDocument();
@@ -63,7 +62,7 @@ describe('<DuplicatedServersModal />', () => {
     [[mockServer({ url: 'url', apiKey: 'apiKey' })]],
     [[mockServer({ url: 'url_1', apiKey: 'apiKey_1' }), mockServer({ url: 'url_2', apiKey: 'apiKey_2' })]],
   ])('displays provided server data', async (duplicatedServers) => {
-    setUp(duplicatedServers);
+    const page = await setUp(duplicatedServers);
 
     if (duplicatedServers.length === 0) {
       await expect.element(page.getByRole('listitem')).not.toBeInTheDocument();
@@ -87,7 +86,7 @@ describe('<DuplicatedServersModal />', () => {
   });
 
   it('invokes onClose when appropriate button is clicked', async () => {
-    const { user } = setUp();
+    const { user, ...page } = await setUp();
 
     expect(onClose).not.toHaveBeenCalled();
     await user.click(page.getByRole('button', { name: 'Discard' }));
@@ -95,7 +94,7 @@ describe('<DuplicatedServersModal />', () => {
   });
 
   it('invokes onConfirm when appropriate button is clicked', async () => {
-    const { user } = setUp();
+    const { user, ...page } = await setUp();
 
     expect(onConfirm).not.toHaveBeenCalled();
     await user.click(page.getByRole('button', { name: 'Save duplicate' }));

test/servers/helpers/ServerForm.test.tsx

@@ -1,17 +1,21 @@
-import { fireEvent } from '@testing-library/react';
-import { page } from 'vitest/browser';
 import { ServerForm } from '../../../src/servers/helpers/ServerForm';
 import { checkAccessibility } from '../../__helpers__/accessibility';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<ServerForm />', () => {
   const onSubmit = vi.fn();
-  const setUp = () => renderWithEvents(<ServerForm onSubmit={onSubmit}>Something</ServerForm>);
+  const setUp = () =>
+    renderWithEvents(
+      <ServerForm onSubmit={onSubmit}>
+        <span>Something</span>
+        <button type="submit">Submit</button>
+      </ServerForm>,
+    );
 
   it('passes a11y checks', () => checkAccessibility(setUp()));
 
   it('renders inputs', async () => {
-    setUp();
+    const page = await setUp();
 
     await expect.element(page.getByLabelText(/^Name/)).toBeInTheDocument();
     await expect.element(page.getByLabelText(/^URL/)).toBeInTheDocument();
@@ -21,15 +25,22 @@ describe('<ServerForm />', () => {
   });
 
   it('invokes submit callback when submit event is triggered', async () => {
-    setUp();
+    const { user, ...page } = await setUp();
 
     expect(onSubmit).not.toHaveBeenCalled();
-    fireEvent.submit(page.getByTestId('server-form').element(), { preventDefault: vi.fn() });
+
+    // Fill required elements so the form can be submitted
+    await user.type(page.getByLabelText(/^Name/), 'The server');
+    await user.type(page.getByLabelText(/^URL/), 'https://example.com');
+    await user.type(page.getByLabelText(/^API key/), '123456');
+
+    await user.click(page.getByRole('button', { name: 'Submit' }));
+
     expect(onSubmit).toHaveBeenCalled();
   });
 
   it('shows advanced options', async () => {
-    const { user } = setUp();
+    const { user, ...page } = await setUp();
     const forwardCredentialsLabel = 'Forward credentials to this server on every request.';
 
     await expect.element(page.getByLabelText(forwardCredentialsLabel)).not.toBeInTheDocument();