Fix typescript jest issue in forgotPassword.test.ts (#2110)

* don't throw an error if checkYarn is null or checkYarn.stdout is null or undefined * make sure to check if this version is less than the latest version (newapp) * fix forgotpassword test template, sync auth example tests * revert to ensure monorepo tests work * revert to original password and index tests * remove merge reference Co-authored-by: Roshan Manuel <Roshan,[email protected]> Co-authored-by: Brandon Bayer <[email protected]>
blitz-js · Mar 17, 2021 · 12f5339 · 12f5339
1 parent c574e28
commit 12f5339
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/examples/auth/app/auth/mutations/forgotPassword.test.ts b/examples/auth/app/auth/mutations/forgotPassword.test.ts
@@ -9,7 +9,7 @@ beforeEach(async () => {
 
 const generatedToken = "plain-token"
 jest.mock("@blitzjs/core/server", () => ({
-  ...jest.requireActual("@blitzjs/core/server")!,
+  ...jest.requireActual<object>("@blitzjs/core/server")!,
   generateToken: () => generatedToken,
 }))
 jest.mock("preview-email", () => jest.fn())

diff --git a/examples/auth/app/pages/index.test.tsx b/examples/auth/app/pages/index.test.tsx
@@ -2,7 +2,7 @@ import {render} from "test/utils"
 import Home from "./index"
 
 jest.mock("@blitzjs/core", () => ({
-  ...jest.requireActual("@blitzjs/core")!,
+  ...jest.requireActual<object>("@blitzjs/core")!,
   useQuery: () => [
     {
       id: 1,
@@ -24,4 +24,4 @@ test("renders blitz documentation link", () => {
   const element = getByText(/powered by blitz/i)
   // @ts-ignore
   expect(element).toBeInTheDocument()
-})
+})
diff --git a/packages/generator/templates/app/app/auth/mutations/forgotPassword.test.ts b/packages/generator/templates/app/app/auth/mutations/forgotPassword.test.ts
@@ -9,7 +9,7 @@ beforeEach(async () => {
 
 const generatedToken = "plain-token"
 jest.mock("blitz", () => ({
-  ...jest.requireActual("blitz")!,
+  ...jest.requireActual<object>("blitz")!,
   generateToken: () => generatedToken,
 }))
 jest.mock("preview-email", () => jest.fn())