remove no longer needed double mock def

redwoodjs · May 22, 2024 · 4b42b86 · 4b42b86
1 parent 0e5ea27
commit 4b42b86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/packages/router/src/__tests__/routeScrollReset.test.tsx b/packages/router/src/__tests__/routeScrollReset.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 
 import { act, cleanup, render, screen } from '@testing-library/react'
-import { describe, beforeEach, afterEach, it, vi, expect } from 'vitest'
+import { describe, beforeEach, afterEach, it, expect } from 'vitest'
 import type { Mock } from 'vitest'
 
 import { navigate } from '../history'
@@ -19,11 +19,6 @@ describe('Router scroll reset', () => {
     </Router>
   )
 
-  // Redfine the mocks here again (already done in jest.setup)
-  // Otherwise the mock doesn't clear for some reason
-  // @ts-expect-error TODO(jgmw): Fix this typing
-  globalThis.scrollTo = vi.fn()
-
   beforeEach(async () => {
     ;(globalThis.scrollTo as Mock).mockClear()
     render(<TestRouter />)

diff --git a/packages/router/vitest.setup.mts b/packages/router/vitest.setup.mts
@@ -3,7 +3,7 @@ import '@testing-library/jest-dom/vitest'
 import { afterEach, vi } from 'vitest'
 import { cleanup } from '@testing-library/react'
 
-// @ts-expect-error TODO(jgmw): Fix this typing
+// @ts-expect-error
 globalThis.scrollTo = vi.fn()
 
 afterEach(() => {