Rework tests based on changes

Author: johnsimons

src/Frontend/src/composables/useCustomChecksStoreAutoRefresh.ts

@@ -1,13 +1,14 @@
 import { useCustomChecksStore } from "@/stores/CustomChecksStore";
 import createAutoRefresh from "./autoRefresh";
 
-const store = useCustomChecksStore();
-
-const useCustomChecksStoreAutoRefresh = () => ({
-  autoRefresh: createAutoRefresh(store.refresh, {
-    intervalMs: 5000,
-  })(),
-  store,
-});
+const useCustomChecksStoreAutoRefresh = () => {
+  const store = useCustomChecksStore();
+  return {
+    autoRefresh: createAutoRefresh(store.refresh, {
+      intervalMs: 5000,
+    })(),
+    store,
+  };
+};
 
 export default useCustomChecksStoreAutoRefresh;

src/Frontend/src/composables/useHeartbeatInstancesStoreAutoRefresh.ts

@@ -1,13 +1,14 @@
 import { useHeartbeatInstancesStore } from "@/stores/HeartbeatInstancesStore";
 import createAutoRefresh from "./autoRefresh";
 
-const store = useHeartbeatInstancesStore();
-
-const useHeartbeatInstancesStoreAutoRefresh = () => ({
-  autoRefresh: createAutoRefresh(store.refresh, {
-    intervalMs: 5000,
-  })(),
-  store,
-});
+const useHeartbeatInstancesStoreAutoRefresh = () => {
+  const store = useHeartbeatInstancesStore();
+  return {
+    autoRefresh: createAutoRefresh(store.refresh, {
+      intervalMs: 5000,
+    })(),
+    store,
+  };
+};
 
 export default useHeartbeatInstancesStoreAutoRefresh;

src/Frontend/src/composables/useHeartbeatsStoreAutoRefresh.ts

@@ -1,13 +1,14 @@
 import createAutoRefresh from "./autoRefresh";
 import { useHeartbeatsStore } from "@/stores/HeartbeatsStore";
 
-const store = useHeartbeatsStore();
-
-const useHeartbeatsStoreAutoRefresh = () => ({
-  autoRefresh: createAutoRefresh(store.refresh, {
-    intervalMs: 5000,
-  })(),
-  store,
-});
+const useHeartbeatsStoreAutoRefresh = () => {
+  const store = useHeartbeatsStore();
+  return {
+    autoRefresh: createAutoRefresh(store.refresh, {
+      intervalMs: 5000,
+    })(),
+    store,
+  };
+};
 
 export default useHeartbeatsStoreAutoRefresh;

src/Frontend/src/composables/useThroughputStoreAutoRefresh.ts

@@ -1,13 +1,14 @@
 import { useThroughputStore } from "@/stores/ThroughputStore";
 import createAutoRefresh from "./autoRefresh";
 
-const store = useThroughputStore();
-
-const useThroughputStoreAutoRefresh = () => ({
-  autoRefresh: createAutoRefresh(store.refresh, {
-    intervalMs: 60 * 60 * 1000 /* 1 hour */,
-  })(),
-  store,
-});
+const useThroughputStoreAutoRefresh = () => {
+  const store = useThroughputStore();
+  return {
+    autoRefresh: createAutoRefresh(store.refresh, {
+      intervalMs: 60 * 60 * 1000 /* 1 hour */,
+    })(),
+    store,
+  };
+};
 
 export default useThroughputStoreAutoRefresh;

src/Frontend/src/views/ThroughputReportView.spec.ts

@@ -12,6 +12,7 @@ import { RouterLinkStub } from "@vue/test-utils";
 import ThroughputReportView from "@/views/ThroughputReportView.vue";
 import Toast from "vue-toastification";
 import { serviceControlWithThroughput } from "@/views/throughputreport/serviceControlWithThroughput";
+import flushPromises from "flush-promises";
 
 describe("EndpointsView tests", () => {
   async function setup() {
@@ -44,6 +45,7 @@ describe("EndpointsView tests", () => {
         plugins: [makeRouter(), Toast, createTestingPinia({ stubActions: false })],
       },
     });
+    await flushPromises();
 
     return { debug, driver };
   }

src/Frontend/src/views/throughputreport/EndpointsView.spec.ts

@@ -11,6 +11,7 @@ import makeRouter from "@/router";
 import { RouterLinkStub } from "@vue/test-utils";
 import EndpointsView from "./EndpointsView.vue";
 import { serviceControlWithThroughput } from "@/views/throughputreport/serviceControlWithThroughput";
+import flushPromises from "flush-promises";
 
 describe("EndpointsView tests", () => {
   async function setup(transport: Transport) {
@@ -38,6 +39,7 @@ describe("EndpointsView tests", () => {
         plugins: [makeRouter(), createTestingPinia({ stubActions: false })],
       },
     });
+    await flushPromises();
 
     return { debug, driver };
   }

src/Frontend/src/views/throughputreport/SetupView.spec.ts

@@ -13,6 +13,7 @@ import { ConnectionSettingsTestResult } from "@/resources/ConnectionTestResults"
 import makeRouter from "@/router";
 import { RouterLinkStub } from "@vue/test-utils";
 import { serviceControlWithThroughput } from "@/views/throughputreport/serviceControlWithThroughput";
+import flushPromises from "flush-promises";
 
 describe("SetupView tests", () => {
   async function setup() {
@@ -59,6 +60,7 @@ describe("SetupView tests", () => {
         plugins: [makeRouter(), createTestingPinia({ stubActions: false })],
       },
     });
+    await flushPromises();
 
     return { debug, driver };
   }

src/Frontend/src/views/throughputreport/endpoints/DetectedListView.spec.ts

@@ -12,6 +12,7 @@ import { UserIndicator } from "@/views/throughputreport/endpoints/userIndicator"
 import { within } from "@testing-library/vue";
 import UpdateUserIndicator from "@/resources/UpdateUserIndicator";
 import { serviceControlWithThroughput } from "@/views/throughputreport/serviceControlWithThroughput";
+import flushPromises from "flush-promises";
 
 describe("DetectedListView tests", () => {
   async function setup() {
@@ -52,6 +53,7 @@ describe("DetectedListView tests", () => {
         ...props,
       },
     });
+    await flushPromises();
 
     return { debug, driver };
   }

src/Frontend/src/views/throughputreport/setup/MasksView.spec.ts

@@ -7,6 +7,7 @@ import { useServiceControlUrls } from "@/composables/serviceServiceControlUrls";
 import { minimumSCVersionForThroughput } from "@/views/throughputreport/isThroughputSupported";
 import Toast from "vue-toastification";
 import { disableMonitoring } from "../../../../test/drivers/vitest/setup";
+import flushPromises from "flush-promises";
 
 describe("MaskView tests", () => {
   async function setup() {
@@ -28,6 +29,7 @@ describe("MaskView tests", () => {
     useServiceControlUrls();
     await useServiceControl();
     const { debug } = render(MasksView, { global: { plugins: [Toast] } });
+    await flushPromises();
 
     return { debug, driver };
   }

src/Frontend/test/specs/heartbeats/configuring-heartbeats.spec.ts

@@ -10,6 +10,7 @@ import { getAllHeartbeatEndpointRecords, getHeartbeatEndpointRecord } from "./qu
 import { healthyEndpointTemplate } from "../../mocks/heartbeat-endpoint-template";
 import { setHeartbeatFilter } from "./actions/setHeartbeatFilter";
 import { getHeartbeatFilterValue } from "./questions/getHeartbeatFilterValue";
+import flushPromises from "flush-promises";
 
 vi.mock("@vueuse/core", async (importOriginal) => {
   const originalModule = await importOriginal<typeof import("@vueuse/core")>();
@@ -73,6 +74,8 @@ describe("FEATURE: Heartbeats configuration", () => {
       await toggleHeartbeatMonitoring("TestEndpoint_1");
 
       await driver.goTo("heartbeats/unhealthy");
+      // Force all the initial pending remote calls on the page to resolve.
+      await flushPromises();
 
       const unhealthyEndpoint = await getHeartbeatEndpointRecord("TestEndpoint_1");
 
@@ -95,6 +98,8 @@ describe("FEATURE: Heartbeats configuration", () => {
       await toggleHeartbeatMonitoring("Healthy_UnmonitoredEndpoint");
 
       await driver.goTo("heartbeats/healthy");
+      // Force all the initial pending remote calls on the page to resolve.
+      await flushPromises();
 
       const healthyEndpoint = await getHeartbeatEndpointRecord("Healthy_UnmonitoredEndpoint");
 
@@ -117,6 +122,8 @@ describe("FEATURE: Heartbeats configuration", () => {
       await toggleHeartbeatMonitoring("Unhealthy_UnmonitoredEndpoint");
 
       await driver.goTo("heartbeats/unhealthy");
+      // Force all the initial pending remote calls on the page to resolve.
+      await flushPromises();
 
       const healthyEndpoint = await getHeartbeatEndpointRecord("Unhealthy_UnmonitoredEndpoint");