linode · bnussman-akamai · Oct 11, 2024 · Oct 10, 2024 · Oct 10, 2024 · Oct 10, 2024
@@ -195,7 +195,7 @@
     "eslint-plugin-xss": "^0.1.10",
     "factory.ts": "^0.5.1",
     "glob": "^10.3.1",
-    "jsdom": "^24.1.1",
+    "happy-dom": "^15.7.4",
     "junit2json": "^3.1.4",
     "lint-staged": "^15.2.9",
     "mocha-junit-reporter": "^2.2.1",

@@ -31,7 +31,7 @@ describe('Avatar', () => {
     const avatarStyles = getComputedStyle(avatar);
 
     expect(getByTestId('avatar-letter')).toHaveTextContent('M');
-    expect(avatarStyles.backgroundColor).toBe('rgb(1, 116, 188)'); // theme.color.primary.dark (#0174bc)
+    expect(avatarStyles.backgroundColor).toBe('#0174bc'); // theme.color.primary.dark (#0174bc)
   });
 
   it('should render a background color from props', () => {
@@ -48,8 +48,8 @@ describe('Avatar', () => {
     const avatarTextStyles = getComputedStyle(avatarText);
 
     // Confirm background color contrasts with text color.
-    expect(avatarStyles.backgroundColor).toBe('rgb(0, 0, 0)'); // black
-    expect(avatarTextStyles.color).toBe('rgb(255, 255, 255)'); // white
+    expect(avatarStyles.backgroundColor).toBe('#000000'); // black
+    expect(avatarTextStyles.color).toBe('#fff'); // white
   });
 
   it('should render the first letter of username from props', async () => {

@@ -17,7 +17,7 @@ describe('BetaChip', () => {
     const { getByTestId } = renderWithTheme(<BetaChip color="primary" />);
     const betaChip = getByTestId('betaChip');
     expect(betaChip).toBeInTheDocument();
-    expect(betaChip).toHaveStyle('background-color: rgb(16, 138, 214)');
+    expect(betaChip).toHaveStyle('background-color: #108ad6');
   });
 
   it('triggers an onClick callback', () => {

@@ -32,7 +32,7 @@ describe('Description List', () => {
   it('has it title bolded', () => {
     const { getByText } = renderWithTheme(<DescriptionList items={items} />);
     const title = getByText('Random title');
-    expect(title).toHaveStyle('font-family: "LatoWebBold",sans-serif');
+    expect(title).toHaveStyle('font-family: LatoWebBold, sans-serif');
   });
 
   it('renders a column by default', () => {

@@ -4,52 +4,52 @@ exports[`HighlightedMarkdown component > should highlight text consistently 1`]
 <DocumentFragment>
   <p
     class="MuiTypography-root MuiTypography-body1 formatted-text undefined css-ma9s0e-MuiTypography-root"
-  />
-  <h1>
-    Some markdown
-  </h1>
-
+  >
+    <h1>
+      Some markdown
+    </h1>
+    
 
-  <pre>
-    <code
-      class="hljs javascript"
-    >
-      <span
-        class="hljs-keyword"
-      >
-        const
-      </span>
-       x = 
-      <span
-        class="hljs-function"
+    <pre>
+      <code
+        class="hljs javascript"
       >
         <span
           class="hljs-keyword"
         >
-          function
+          const
         </span>
-        (
+         x = 
         <span
-          class="hljs-params"
-        />
-        ) 
-      </span>
-      { 
-      <span
-        class="hljs-keyword"
-      >
-        return
-      </span>
-
-      <span
-        class="hljs-literal"
-      >
-        true
-      </span>
-      ; }
+          class="hljs-function"
+        >
+          <span
+            class="hljs-keyword"
+          >
+            function
+          </span>
+          (
+          <span
+            class="hljs-params"
+          />
+          ) 
+        </span>
+        { 
+        <span
+          class="hljs-keyword"
+        >
+          return
+        </span>
+
+        <span
+          class="hljs-literal"
+        >
+          true
+        </span>
+        ; }
 
-    </code>
-  </pre>
-  <p />
+      </code>
+    </pre>
+  </p>
 </DocumentFragment>
 `;
@@ -11,8 +11,8 @@ describe('Notice Component', () => {
     const notice = container.firstChild;
 
     expect(notice).toHaveStyle('margin-bottom: 24px');
-    expect(notice).toHaveStyle('margin-left: 0');
-    expect(notice).toHaveStyle('margin-top: 0');
+    expect(notice).toHaveStyle('margin-left: 0px');
+    expect(notice).toHaveStyle('margin-top: 0px');
   });
 
   it('renders with text', () => {

@@ -20,7 +20,7 @@ describe('Tab Component', () => {
 
     expect(tabElement).toHaveStyle(`
       display: inline-flex;
-      color: rgb(0, 156, 222);
+      color: #0174bc;
     `);
   });
 

@@ -56,7 +56,7 @@ describe('TextTooltip', () => {
 
     const displayText = getByText(props.displayText);
 
-    expect(displayText).toHaveStyle('color: rgb(0, 156, 222)');
+    expect(displayText).toHaveStyle('color: #0174bc');
     expect(displayText).toHaveStyle('font-size: 18px');
   });
 

@@ -24,7 +24,9 @@ describe('Database Create', () => {
     const { getAllByTestId, getAllByText } = renderWithTheme(
       <DatabaseCreate />
     );
-    await waitForElementToBeRemoved(getAllByTestId(loadingTestId));
+    await waitForElementToBeRemoved(getAllByTestId(loadingTestId), {
+      timeout: 10_000,
+    });
 
     getAllByText('Cluster Label');
     getAllByText('Database Engine');

@@ -1,4 +1,4 @@
-import { screen, within } from '@testing-library/react';
+import { screen, waitFor, within } from '@testing-library/react';
 import { fireEvent } from '@testing-library/react';
 import { waitForElementToBeRemoved } from '@testing-library/react';
 import { DateTime } from 'luxon';
@@ -71,6 +71,7 @@ describe('Database Table Row', () => {
 
 describe('Database Table', () => {
   it('should render database landing table with items', async () => {
+    const database = databaseInstanceFactory.build({ status: 'active' });
     const mockAccount = accountFactory.build({
       capabilities: [managedDBBetaCapability],
     });
@@ -81,32 +82,25 @@ describe('Database Table', () => {
     );
     server.use(
       http.get(databaseInstancesEndpoint, () => {
-        const databases = databaseInstanceFactory.buildList(1, {
-          status: 'active',
-        });
-        return HttpResponse.json(makeResourcePage(databases));
+        return HttpResponse.json(makeResourcePage([database]));
       })
     );
 
-    const { getAllByText, getByTestId, queryAllByText } = renderWithTheme(
-      <DatabaseLanding />
-    );
+    const { getByText } = renderWithTheme(<DatabaseLanding />);
 
-    // Loading state should render
-    expect(getByTestId(loadingTestId)).toBeInTheDocument();
-
-    await waitForElementToBeRemoved(getByTestId(loadingTestId));
+    // wait for API data to load
+    await waitFor(() => expect(getByText(database.label)).toBeVisible(), {
+      timeout: 10_000,
+    });
+    expect(getByText('Active')).toBeVisible();
 
     // Static text and table column headers
-    getAllByText('Cluster Label');
-    getAllByText('Status');
-    getAllByText('Configuration');
-    getAllByText('Engine');
-    getAllByText('Region');
-    getAllByText('Created');
-
-    // Check to see if the mocked API data rendered in the table
-    queryAllByText('Active');
+    expect(getByText('Cluster Label')).toBeVisible();
+    expect(getByText('Status')).toBeVisible();
+    expect(getByText('Configuration')).toBeVisible();
+    expect(getByText('Engine')).toBeVisible();
+    expect(getByText('Region')).toBeVisible();
+    expect(getByText('Created')).toBeVisible();
   });
 
   it('should render database landing with empty state', async () => {

@@ -1,4 +1,4 @@
-import { fireEvent } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
 import { UNKNOWN_PRICE } from 'src/utilities/pricing/constants';
@@ -42,11 +42,11 @@ describe('HAControlPlane', () => {
     await findByText(/\$60\.00/);
   });
 
-  it('should call the handleChange function on change', () => {
+  it('should call the handleChange function on change', async () => {
     const { getByTestId } = renderWithTheme(<HAControlPlane {...props} />);
     const haRadioButton = getByTestId('ha-radio-button-yes');
 
-    fireEvent.click(haRadioButton);
+    await userEvent.click(haRadioButton);
     expect(props.setHighAvailability).toHaveBeenCalled();
   });
 });
@@ -33,7 +33,7 @@ describe('Disks', () => {
     const { getByTestId } = render(wrapWithTheme(<Disks {...props} />));
     disks.forEach((eachDisk) => {
       const checkbox = getByTestId(`checkbox-${eachDisk.id}`).parentNode;
-      fireEvent.click(checkbox as any);
+      fireEvent.click(checkbox!);
       expect(mockHandleSelect).toHaveBeenCalledWith(eachDisk.id);
     });
   });
@@ -47,10 +47,10 @@ describe('Disks', () => {
   });
 
   it('checks the disk if the associated config is selected', () => {
-    const { getByTestId } = render(
+    const { getByRole } = render(
       wrapWithTheme(<Disks {...props} selectedConfigIds={[9859511]} />)
     );
-    const checkbox: any = getByTestId('checkbox-19040624').firstElementChild;
-    expect(checkbox).toHaveAttribute('checked');
+    const checkbox = getByRole('checkbox', { name: '512 MB Swap Image' });
+    expect(checkbox).toBeChecked();
   });
 });
@@ -69,7 +69,7 @@ describe('VPC', () => {
 
   it('renders VPC IPv4, NAT checkboxes, and IP Ranges inputs when a subnet is selected', async () => {
     const {
-      getByLabelText,
+      getByRole,
       getByText,
     } = renderWithThemeAndHookFormContext<CreateLinodeRequest>({
       component: <VPC />,
@@ -82,21 +82,23 @@ describe('VPC', () => {
     });
 
     expect(
-      getByLabelText(
-        'Auto-assign a VPC IPv4 address for this Linode in the VPC'
-      )
+      getByRole('checkbox', {
+        name: 'Auto-assign a VPC IPv4 address for this Linode in the VPC',
+      })
     ).toBeInTheDocument();
 
     expect(
-      getByLabelText('Assign a public IPv4 address for this Linode')
+      getByRole('checkbox', {
+        name: 'Assign a public IPv4 address for this Linode',
+      })
     ).toBeInTheDocument();
 
     expect(getByText('Assign additional IPv4 ranges')).toBeInTheDocument();
   });
 
   it('should check the VPC IPv4 if a "ipv4.vpc" is null/undefined', async () => {
     const {
-      getByLabelText,
+      getByRole,
     } = renderWithThemeAndHookFormContext<CreateLinodeRequest>({
       component: <VPC />,
       useFormOptions: {
@@ -112,15 +114,16 @@ describe('VPC', () => {
     });
 
     expect(
-      getByLabelText(
-        'Auto-assign a VPC IPv4 address for this Linode in the VPC'
-      )
+      getByRole('checkbox', {
+        name: 'Auto-assign a VPC IPv4 address for this Linode in the VPC',
+      })
     ).toBeChecked();
   });
 
   it('should uncheck the VPC IPv4 if a "ipv4.vpc" is a string value and show the VPC IP TextField', async () => {
     const {
       getByLabelText,
+      getByRole,
     } = renderWithThemeAndHookFormContext<CreateLinodeRequest>({
       component: <VPC />,
       useFormOptions: {
@@ -132,9 +135,9 @@ describe('VPC', () => {
     });
 
     expect(
-      getByLabelText(
-        'Auto-assign a VPC IPv4 address for this Linode in the VPC'
-      )
+      getByRole('checkbox', {
+        name: 'Auto-assign a VPC IPv4 address for this Linode in the VPC',
+      })
     ).not.toBeChecked();
 
     expect(getByLabelText('VPC IPv4 (required)')).toBeVisible();

@@ -23,10 +23,10 @@ describe('Linode Create', () => {
   });
 
   it('Should not render the region select when creating from a backup', () => {
-    const { queryByText } = renderWithTheme(<LinodeCreate />, {
+    const { queryByLabelText } = renderWithTheme(<LinodeCreate />, {
       MemoryRouter: { initialEntries: ['/linodes/create?type=Backups'] },
     });
 
-    expect(queryByText('Region')).toBeNull();
+    expect(queryByLabelText('Region')).toBeNull();
   });
 });