test: fix LoadingButton tests

openedx · Jan 15, 2024 · 6082f9a · 6082f9a
1 parent 971de66
commit 6082f9a
Showing 1 changed file with 12 additions and 27 deletions.
diff --git a/src/generic/loading-button/LoadingButton.test.jsx b/src/generic/loading-button/LoadingButton.test.jsx
@@ -1,5 +1,10 @@
 import React from 'react';
-import { fireEvent, render, waitFor } from '@testing-library/react';
+import {
+  act,
+  fireEvent,
+  render,
+  waitFor,
+} from '@testing-library/react';
 
 import LoadingButton from '.';
 
@@ -27,8 +32,9 @@ describe('<LoadingButton />', () => {
   });
 
   it('renders the spinner correctly', async () => {
+    let resolver;
     const longFunction = () => new Promise((resolve) => {
-      setTimeout(resolve, 1000);
+      resolver = resolve;
     });
     const { container, getByRole, getByText } = render(RootWrapper(longFunction));
     const buttonElement = getByRole('button');
@@ -38,31 +44,10 @@ describe('<LoadingButton />', () => {
     // StatefulButton only sets aria-disabled (not disabled) when the state is pending
     // expect(buttonElement).toBeDisabled();
     expect(buttonElement).toHaveAttribute('aria-disabled', 'true');
-    await waitFor(() => {
-      // StatefulButton only sets aria-disabled (not disabled) when the state is pending
-      // expect(buttonElement).toBeEnabled();
-      expect(buttonElement).not.toHaveAttribute('aria-disabled', 'true');
-      expect(container.getElementsByClassName('icon-spin').length).toBe(0);
-    });
-  });
 
-  it('renders the spinner correctly even with error', async () => {
-    const longFunction = () => new Promise((_resolve, reject) => {
-      setTimeout(reject, 1000);
-    });
-    const { container, getByRole, getByText } = render(RootWrapper(longFunction));
-    const buttonElement = getByRole('button');
-    fireEvent.click(buttonElement);
-    expect(container.getElementsByClassName('icon-spin').length).toBe(1);
-    expect(getByText(buttonTitle)).toBeInTheDocument();
-    // StatefulButton only sets aria-disabled (not disabled) when the state is pending
-    // expect(buttonElement).toBeDisabled();
-    expect(buttonElement).toHaveAttribute('aria-disabled', 'true');
-    await waitFor(() => {
-      // StatefulButton only sets aria-disabled (not disabled) when the state is pending
-      // expect(buttonElement).toBeEnabled();
-      expect(buttonElement).not.toHaveAttribute('aria-disabled', 'true');
-      expect(container.getElementsByClassName('icon-spin').length).toBe(0);
-    });
+    await act(async () => { resolver(); });
+
+    expect(buttonElement).not.toHaveAttribute('aria-disabled', 'true');
+    expect(container.getElementsByClassName('icon-spin').length).toBe(0);
   });
 });