Fix Audit Log page test

BrunoQuaresma · BrunoQuaresma · commit 6442b3a93925 · 2023-01-19T13:34:27.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -34,18 +34,6 @@ export const withDefaultFeatures = (
   return fs as TypesGen.Entitlements["features"]
 }
 
-// defaultEntitlements has a default set of disabled functionality.
-export const defaultEntitlements = (): TypesGen.Entitlements => {
-  return {
-    features: withDefaultFeatures({}),
-    has_license: false,
-    errors: [],
-    warnings: [],
-    experimental: false,
-    trial: false,
-  }
-}
-
 // Always attach CSRF token to all requests.
 // In puppeteer the document is undefined. In those cases, just
 // do nothing.
@@ -625,15 +613,8 @@ export const putWorkspaceExtension = async (
 }
 
 export const getEntitlements = async (): Promise<TypesGen.Entitlements> => {
-  try {
-    const response = await axios.get("/api/v2/entitlements")
-    return response.data
-  } catch (error) {
-    if (axios.isAxiosError(error) && error.response?.status === 404) {
-      return defaultEntitlements()
-    }
-    throw error
-  }
+  const response = await axios.get("/api/v2/entitlements")
+  return response.data
 }
 
 export const getExperiments = async (): Promise<TypesGen.Experiment[]> => {
diff --git a/site/src/pages/AuditPage/AuditPage.test.tsx b/site/src/pages/AuditPage/AuditPage.test.tsx
@@ -1,26 +1,64 @@
 import { screen, waitFor } from "@testing-library/react"
 import userEvent from "@testing-library/user-event"
 import * as API from "api/api"
+import { rest } from "msw"
 import {
-  history,
+  renderWithAuth,
   MockAuditLog,
   MockAuditLog2,
-  render,
   waitForLoaderToBeRemoved,
+  MockEntitlementsWithAuditLog,
 } from "testHelpers/renderHelpers"
+import { server } from "testHelpers/server"
+
 import * as CreateDayString from "util/createDayString"
 import AuditPage from "./AuditPage"
 
+interface RenderPageOptions {
+  filter?: string
+  page?: number
+}
+
+const renderPage = async ({ filter, page }: RenderPageOptions = {}) => {
+  let route = "/audit"
+  const params = new URLSearchParams()
+
+  if (filter) {
+    params.set("filter", filter)
+  }
+
+  if (page) {
+    params.set("page", page.toString())
+  }
+
+  if (Array.from(params).length > 0) {
+    route += `?${params.toString()}`
+  }
+
+  renderWithAuth(<AuditPage />, {
+    route,
+    path: "/audit",
+  })
+  await waitForLoaderToBeRemoved()
+}
+
 describe("AuditPage", () => {
   beforeEach(() => {
     // Mocking the dayjs module within the createDayString file
     const mock = jest.spyOn(CreateDayString, "createDayString")
     mock.mockImplementation(() => "a minute ago")
+
+    // Mock the entitlements
+    server.use(
+      rest.get("/api/v2/entitlements", (req, res, ctx) => {
+        return res(ctx.status(200), ctx.json(MockEntitlementsWithAuditLog))
+      }),
+    )
   })
 
   it("shows the audit logs", async () => {
     // When
-    render(<AuditPage />)
+    await renderPage()
 
     // Then
     await screen.findByTestId(`audit-log-row-${MockAuditLog.id}`)
@@ -29,8 +67,7 @@ describe("AuditPage", () => {
 
   describe("Filtering", () => {
     it("filters by typing", async () => {
-      render(<AuditPage />)
-      await waitForLoaderToBeRemoved()
+      await renderPage()
       await screen.findByText("updated", { exact: false })
 
       const filterField = screen.getByLabelText("Filter")
@@ -47,19 +84,14 @@ describe("AuditPage", () => {
         .mockResolvedValue({ audit_logs: [MockAuditLog], count: 1 })
 
       const query = "resource_type:workspace action:create"
-      history.push(`/audit?filter=${encodeURIComponent(query)}`)
-      render(<AuditPage />)
-
-      await waitForLoaderToBeRemoved()
+      await renderPage({ filter: query })
 
       expect(getAuditLogsSpy).toBeCalledWith({ limit: 25, offset: 0, q: query })
     })
 
     it("resets page to 1 when filter is changed", async () => {
-      history.push(`/audit?page=2`)
-      render(<AuditPage />)
+      await renderPage({ page: 2 })
 
-      await waitForLoaderToBeRemoved()
       const getAuditLogsSpy = jest.spyOn(API, "getAuditLogs")
 
       const filterField = screen.getByLabelText("Filter")
