Query helpers should invoke fetch before returning w/ promise (refs #30)

benvinegar · Feb 4, 2024 · 24a68f5 · 24a68f5
1 parent 6c71083
commit 24a68f5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/app/analytics/query.test.ts b/app/analytics/query.test.ts
@@ -2,8 +2,6 @@ import { describe, expect, test, vi, beforeEach, afterEach } from 'vitest'
 
 import { AnalyticsEngineAPI } from "./query";
 
-// mock out fetch
-global.fetch = vi.fn();
 function createFetchResponse(data: any) {
     return {
         ok: true,
@@ -13,14 +11,16 @@ function createFetchResponse(data: any) {
 
 describe("AnalyticsEngineAPI", () => {
     const api = new AnalyticsEngineAPI("test_account_id_abc123", "test_api_token_def456");
-    const fetch = global.fetch as any;
+    let fetch: any; // todo: figure out how to type this mocked fetch
 
     beforeEach(() => {
+        fetch = global.fetch = vi.fn();
         vi.useFakeTimers()
     });
 
     afterEach(() => {
-        vi.useRealTimers()
+        vi.useRealTimers();
+        vi.restoreAllMocks();
     });
 
     describe("query", () => {
@@ -180,8 +180,11 @@ describe("AnalyticsEngineAPI", () => {
                 }))
             }));
 
-            const result = await api.getCounts("example.com", 7);
-            expect(result).toEqual({
+            const result = api.getCounts("example.com", 7);
+
+            // verify fetch was invoked before awaiting result
+            expect(fetch).toHaveBeenCalled();
+            expect(await result).toEqual({
                 views: 6,
                 visits: 3,
                 visitors: 1,
@@ -210,8 +213,11 @@ describe("AnalyticsEngineAPI", () => {
                 }))
             }));
 
-            const result = await api.getVisitorCountByColumn("example.com", "country", 7);
-            expect(result).toEqual([
+            const result = api.getVisitorCountByColumn("example.com", "country", 7);
+
+            // verify fetch was invoked before awaiting result
+            expect(fetch).toHaveBeenCalled();
+            expect(await result).toEqual([
                 ["CA", 3],
                 ["US", 2],
                 ["GB", 1],
@@ -243,8 +249,11 @@ describe("AnalyticsEngineAPI", () => {
                 }))
             }));
 
-            const result = await api.getSitesOrderedByHits(7);
-            expect(result).toEqual([
+
+            const result = api.getSitesOrderedByHits(7);
+            // verify fetch was invoked before awaiting result
+            expect(fetch).toHaveBeenCalled();
+            expect(await result).toEqual([
                 ["example.com", 130],
                 ["foo.com", 100],
                 ["test.dev", 90],

diff --git a/app/analytics/query.ts b/app/analytics/query.ts
@@ -171,8 +171,9 @@ export class AnalyticsEngineAPI {
             GROUP BY _bucket
             ORDER BY _bucket ASC`;
 
+        const queryResult = this.query(query);
         const returnPromise = new Promise<any>((resolve, reject) => (async () => {
-            const response = await this.query(query);
+            const response = await queryResult;
 
             if (!response.ok) {
                 reject(response.statusText);
@@ -217,8 +218,10 @@ export class AnalyticsEngineAPI {
             AND ${siteIdColumn} = '${siteId}'
             GROUP BY isVisitor, isVisit
             ORDER BY isVisitor, isVisit ASC`;
+
+        const queryResult = this.query(query);
         const returnPromise = new Promise<AnalyticsCountResult>((resolve, reject) => (async () => {
-            const response = await this.query(query);
+            const response = await queryResult;
 
             if (!response.ok) {
                 reject(response.statusText);
@@ -265,8 +268,9 @@ export class AnalyticsEngineAPI {
             ORDER BY count DESC
             LIMIT ${limit}`;
 
+        const queryResult = this.query(query);
         const returnPromise = new Promise<any>((resolve, reject) => (async () => {
-            const response = await this.query(query);
+            const response = await queryResult;
 
             if (!response.ok) {
                 reject(response.statusText);
@@ -319,8 +323,10 @@ export class AnalyticsEngineAPI {
             ORDER BY count DESC
             LIMIT ${limit}
         `;
+
+        const queryResult = this.query(query);
         const returnPromise = new Promise<any>((resolve, reject) => (async () => {
-            const response = await this.query(query);
+            const response = await queryResult;
 
             if (!response.ok) {
                 reject(response.statusText);