test(org): use the central mocks in the portal and token tests

Author: waleedlatif1

apps/sim/hooks/queries/subscription-portal.test.tsx

@@ -1,20 +1,23 @@
 /** @vitest-environment jsdom */
+import {
+  apiClientRequestMock,
+  apiClientRequestMockFns,
+} from '@sim/testing/mocks/api-client-request.mock'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { renderDataHook, unmountDataHooks } from '@/platform/lib/render-hook.test-support'
 
-const mocks = vi.hoisted(() => ({ requestJson: vi.fn() }))
-
-vi.mock('@/lib/api/client/request', () => ({ requestJson: mocks.requestJson }))
+vi.mock('@/lib/api/client/request', () => apiClientRequestMock)
 
 import { useOpenBillingPortal } from '@/hooks/queries/subscription'
 
+const mockRequestJson = apiClientRequestMockFns.mockRequestJson
 const BODY = { context: 'user' } as const
 const PORTAL_URL = 'https://billing.example.test/session'
 
 function deferredPortal() {
   let resolve: (value: { url: string }) => void = () => {}
   let reject: (error: Error) => void = () => {}
-  mocks.requestJson.mockReturnValueOnce(
+  mockRequestJson.mockReturnValueOnce(
     new Promise((res, rej) => {
       resolve = res
       reject = rej
@@ -24,7 +27,7 @@ function deferredPortal() {
 }
 
 async function settle() {
-  await vi.waitFor(() => expect(mocks.requestJson).toHaveBeenCalled())
+  await vi.waitFor(() => expect(mockRequestJson).toHaveBeenCalled())
 }
 
 /**
@@ -36,7 +39,7 @@ describe('useOpenBillingPortal after the page that asked has gone', () => {
   const openTab = vi.fn()
 
   beforeEach(() => {
-    mocks.requestJson.mockReset()
+    mockRequestJson.mockReset()
     portalTab.location.href = ''
     portalTab.close.mockReset()
     openTab.mockReset().mockReturnValue(portalTab)
@@ -45,7 +48,6 @@ describe('useOpenBillingPortal after the page that asked has gone', () => {
 
   afterEach(async () => {
     await unmountDataHooks()
-    vi.unstubAllGlobals()
   })
 
   it('still sends the opened tab to the portal', async () => {

apps/sim/lib/organizations/home/account-token.test.ts

@@ -1,21 +1,20 @@
+import {
+  credentialsManagedOauthMock,
+  credentialsManagedOauthMockFns,
+} from '@sim/testing/mocks/credentials-managed-oauth.mock'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const mocks = vi.hoisted(() => ({
-  resolve: vi.fn(),
-  reject: vi.fn(),
-  recordAccess: vi.fn(),
-}))
+const mocks = vi.hoisted(() => ({ recordAccess: vi.fn() }))
 
-vi.mock('@/lib/credentials/managed-oauth', () => ({
-  resolveManagedOAuthToken: mocks.resolve,
-  rejectManagedOAuthToken: mocks.reject,
-}))
+vi.mock('@/lib/credentials/managed-oauth', () => credentialsManagedOauthMock)
 vi.mock('@/lib/oauth/token-resolution', () => ({ recordCredentialAccess: mocks.recordAccess }))
 
 import type { OrganizationMembershipContext } from '@/lib/core/application/organization-authorization'
 import { createAccountTokenRead } from '@/lib/organizations/home/account-token'
 import { HomeProviderReadError } from '@/lib/organizations/home/provider-reads'
 
+const mockResolve = credentialsManagedOauthMockFns.mockResolveManagedOAuthToken
+const mockReject = credentialsManagedOauthMockFns.mockRejectManagedOAuthToken
 const input = {
   context: { organizationId: 'org', userId: 'viewer' } as OrganizationMembershipContext,
   credentialId: 'credential',
@@ -26,19 +25,19 @@ const refused = () => new HomeProviderReadError('token_rejected', 401)
 describe('one request reading an account several times', () => {
   beforeEach(() => {
     let issued = 0
-    mocks.resolve.mockReset().mockImplementation(async () => {
+    mockResolve.mockReset().mockImplementation(async () => {
       issued += 1
       return { accessToken: `token-${issued}` }
     })
-    mocks.reject.mockReset().mockResolvedValue(false)
+    mockReject.mockReset().mockResolvedValue(false)
     mocks.recordAccess.mockReset()
   })
 
   it('resolves and records the token once across reads', async () => {
     const withToken = createAccountTokenRead(input)
     const used = [await withToken(async (token) => token), await withToken(async (token) => token)]
     expect(used).toEqual(['token-1', 'token-1'])
-    expect(mocks.resolve).toHaveBeenCalledOnce()
+    expect(mockResolve).toHaveBeenCalledOnce()
     expect(mocks.recordAccess).toHaveBeenCalledOnce()
   })
 
@@ -53,11 +52,11 @@ describe('one request reading an account several times', () => {
     })
     expect(seen).toEqual(['token-1', 'token-2'])
     expect(retried).toBe('token-2')
-    expect(mocks.reject).toHaveBeenCalledWith(
+    expect(mockReject).toHaveBeenCalledWith(
       expect.objectContaining({ rejectedAccessToken: 'token-1' })
     )
     await expect(withToken(async (token) => token)).resolves.toBe('token-2')
-    expect(mocks.resolve).toHaveBeenCalledTimes(2)
+    expect(mockResolve).toHaveBeenCalledTimes(2)
   })
 
   it('asks to reconnect when the fresh token is refused too', async () => {
@@ -77,7 +76,7 @@ describe('one request reading an account several times', () => {
         throw failure
       })
     ).rejects.toBe(failure)
-    expect(mocks.reject).not.toHaveBeenCalled()
+    expect(mockReject).not.toHaveBeenCalled()
     await expect(withToken(async (token) => token)).resolves.toBe('token-1')
   })