Fixed spinner tests

#1531

Author: bmingles

packages/dashboard-core-plugins/src/panels/ChartPanel.test.tsx

@@ -20,7 +20,7 @@ jest.mock('@deephaven/dashboard', () => ({
   },
 }));
 
-const MockChart = jest.fn(() => null);
+const MockChart: React.FC & jest.Mock = jest.fn(() => null);
 
 jest.mock('@deephaven/chart', () => {
   const { forwardRef } = jest.requireActual('react');
@@ -106,17 +106,16 @@ function callErrorFunction() {
 
 function expectLoading(container) {
   expect(
-    container.querySelector("[data-icon='circle-large']")
+    container.querySelector('[role=progressbar].loading-spinner-large')
   ).toBeInTheDocument();
-  expect(container.querySelector("[data-icon='loading']")).toBeInTheDocument();
 }
 
 function expectNotLoading(container) {
   expect(
     container.querySelector("[data-icon='outline']")
   ).not.toBeInTheDocument();
   expect(
-    container.querySelector("[data-icon='loading']")
+    container.querySelector('[role=progressbar].loading-spinner-large')
   ).not.toBeInTheDocument();
 }
 

packages/dashboard-core-plugins/src/panels/IrisGridPanel.test.tsx

@@ -9,7 +9,7 @@ import type { Container } from '@deephaven/golden-layout';
 import { Workspace } from '@deephaven/redux';
 import { IrisGridPanel } from './IrisGridPanel';
 
-const MockIrisGrid = jest.fn(() => null);
+const MockIrisGrid: React.FC & jest.Mock = jest.fn(() => null);
 
 jest.mock('@deephaven/iris-grid', () => {
   const { forwardRef } = jest.requireActual('react');
@@ -84,10 +84,9 @@ function makeIrisGridPanelWrapper(
 async function expectLoading(container) {
   await waitFor(() =>
     expect(
-      container.querySelector("[data-icon='circle-large']")
+      container.querySelector('[role=progressbar].loading-spinner-large')
     ).toBeInTheDocument()
   );
-  expect(container.querySelector("[data-icon='loading']")).toBeInTheDocument();
 }
 
 async function expectNotLoading(container) {
@@ -97,7 +96,7 @@ async function expectNotLoading(container) {
     ).not.toBeInTheDocument()
   );
   expect(
-    container.querySelector("[data-icon='loading']")
+    container.querySelector('[role=progressbar].loading-spinner-large')
   ).not.toBeInTheDocument();
 }
 
@@ -127,7 +126,7 @@ it('shows the loading spinner until grid is ready', async () => {
   const tablePromise = Promise.resolve(table);
   const makeModel = makeMakeModel(tablePromise);
 
-  expect.assertions(6);
+  expect.assertions(4);
   const { container } = makeIrisGridPanelWrapper(makeModel);
 
   await expectLoading(container);