Fix remaining tests

benvinegar · Dec 12, 2024 · 47af390 · 47af390
1 parent 8479b18
commit 47af390
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 22 deletions.
diff --git a/app/routes/__tests__/resources.paths.test.tsx b/app/routes/__tests__/resources.paths.test.tsx
@@ -25,30 +25,29 @@ describe("Resources/Paths route", () => {
     });
     describe("loader", () => {
         test("returns valid json", async () => {
+            // first request for visitors
             fetch.mockResolvedValueOnce(
                 createFetchResponse({
                     data: [
-                        { blob3: "/", isVisitor: 0, isVisit: 0, count: "5" },
-                        { blob3: "/", isVisitor: 0, isVisit: 1, count: "1" },
-                        { blob3: "/", isVisitor: 1, isVisit: 1, count: "2" },
+                        { blob3: "/", isVisitor: 1, count: "2" },
                         {
                             blob3: "/example",
-                            isVisitor: 0,
-                            isVisit: 0,
+                            isVisitor: 1,
                             count: "4",
                         },
+                    ],
+                }),
+            );
+            // second request for views
+            fetch.mockResolvedValueOnce(
+                createFetchResponse({
+                    data: [
+                        { blob3: "/", isVisitor: 0, count: "5" },
                         {
                             blob3: "/example",
                             isVisitor: 0,
-                            isVisit: 1,
                             count: "6",
                         },
-                        {
-                            blob3: "/example",
-                            isVisitor: 1,
-                            isVisit: 1,
-                            count: "2",
-                        },
                     ],
                 }),
             );
@@ -63,12 +62,14 @@ describe("Resources/Paths route", () => {
 
             // expect redirect
             expect(response.status).toBe(200);
+            expect(fetch).toHaveBeenCalledTimes(2);
 
             const json = await response.json();
+
             expect(json).toEqual({
                 countsByProperty: [
-                    ["/", 2, 8],
-                    ["/example", 2, 12],
+                    ["/example", 4, 10],
+                    ["/", 2, 7],
                 ],
                 page: 1,
             });

diff --git a/app/routes/__tests__/resources.referrer.test.tsx b/app/routes/__tests__/resources.referrer.test.tsx
@@ -26,22 +26,28 @@ describe("Resources/Referrer route", () => {
 
     describe("loader", () => {
         test("returns valid json", async () => {
+            // first request for visitors
             fetch.mockResolvedValueOnce(
                 createFetchResponse({
                     data: [
-                        { blob5: "/", isVisitor: 0, isVisit: 0, count: "5" },
-                        { blob5: "/", isVisitor: 1, isVisit: 1, count: "1" },
+                        { blob5: "/", isVisitor: 1, count: "1" },
                         {
                             blob5: "/example",
-                            isVisitor: 0,
-                            isVisit: 1,
-                            count: "2",
+                            isVisitor: 1,
+                            count: "1",
                         },
+                    ],
+                }),
+            );
+            // second request for views
+            fetch.mockResolvedValueOnce(
+                createFetchResponse({
+                    data: [
+                        { blob5: "/", isVisitor: 0, count: "5" },
                         {
                             blob5: "/example",
-                            isVisitor: 1,
-                            isVisit: 1,
-                            count: "1",
+                            isVisitor: 0,
+                            count: "2",
                         },
                     ],
                 }),
@@ -57,6 +63,7 @@ describe("Resources/Referrer route", () => {
 
             // expect redirect
             expect(response.status).toBe(200);
+            expect(fetch).toHaveBeenCalledTimes(2);
 
             const json = await response.json();
             expect(json).toEqual({