Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[legacy-framework] Fix typescript jest issue in forgotPassword.test.ts #2110

Merged
merged 10 commits into from
Mar 17, 2021
Merged

[legacy-framework] Fix typescript jest issue in forgotPassword.test.ts #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a651c0b
don't throw an error if checkYarn is null or checkYarn.stdout is null…
roshan-sama Mar 1, 2021
55c6afa
make sure to check if this version is less than the latest version
roshan-sama Mar 1, 2021
6399d86
Merge pull request #1 from blitz-js/canary
roshan-sama Mar 5, 2021
db307ca
Merge pull request #2 from blitz-js/canary
roshan-sama Mar 13, 2021
71285b5
fix forgotpassword test template, sync auth example tests
Mar 13, 2021
cd2bdca
Merge branch 'canary' into canary
flybayer Mar 15, 2021
8ea14c9
revert to ensure monorepo tests work
roshan-sama Mar 15, 2021
88de5c5
revert to original password and index tests
Mar 17, 2021
321e963
Merge branch 'canary' of https://github.com/Roesh/blitz into canary
Mar 17, 2021
2e17e47
remove merge reference
roshan-sama Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/auth/app/auth/mutations/forgotPassword.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions examples/auth/app/pages/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -24,4 +24,4 @@ test("renders blitz documentation link", () => {
const element = getByText(/powered by blitz/i)
// @ts-ignore
expect(element).toBeInTheDocument()
})
})
2 changes: 1 addition & 1 deletion packages/generator/templates/app/app/auth/mutations/forgotPassword.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down