update tests to look for comparison API

rilldata · Sep 13, 2023 · 72477bf · 72477bf
1 parent 0903622
commit 72477bf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/web-local/test/ui/dashboards.spec.ts b/web-local/test/ui/dashboards.spec.ts
@@ -7,6 +7,7 @@ import {
   createDashboardFromModel,
   createDashboardFromSource,
   metricsViewRequestFilterMatcher,
+  waitForComparisonTopLists,
   waitForTimeSeries,
   waitForTopLists,
 } from "./utils/dashboardHelpers";
@@ -48,7 +49,7 @@ test.describe("dashboard", () => {
         true
       ),
       waitForTimeSeries(page, "AdBids_model_dashboard"),
-      waitForTopLists(page, "AdBids_model_dashboard", ["domain"]),
+      waitForComparisonTopLists(page, "AdBids_model_dashboard", ["domain"]),
       createDashboardFromModel(page, "AdBids_model"),
     ]);
     await assertAdBidsDashboard(page);
@@ -62,7 +63,7 @@ test.describe("dashboard", () => {
       );
     await Promise.all([
       waitForTimeSeries(page, "AdBids_model_dashboard", domainFilterMatcher),
-      waitForTopLists(
+      waitForComparisonTopLists(
         page,
         "AdBids_model_dashboard",
         ["domain"],

diff --git a/web-local/test/ui/utils/dashboardHelpers.ts b/web-local/test/ui/utils/dashboardHelpers.ts
@@ -94,6 +94,31 @@ export async function waitForTopLists(
   );
 }
 
+/**
+ * Waits for a set of top list queries to end.
+ * Optionally takes a filter matcher: {@link metricsViewRequestFilterMatcher}.
+ */
+export async function waitForComparisonTopLists(
+  page: Page,
+  metricsView: string,
+  dimensions: Array<string>,
+  filterMatcher?: RequestMatcher
+) {
+  const topListUrlRegex = new RegExp(
+    `/metrics-views/${metricsView}/compare-toplist`
+  );
+  await Promise.all(
+    dimensions.map((dimension) =>
+      page.waitForResponse(
+        (response) =>
+          topListUrlRegex.test(response.url()) &&
+          response.request().postDataJSON().dimensionName === dimension &&
+          (filterMatcher ? filterMatcher(response) : true)
+      )
+    )
+  );
+}
+
 export type RequestMatcherFilter = { label: string; values: Array<unknown> };
 
 /**