Skip to content

Commit

Permalink
Merge branch 'main' into feat-async-setupFilesAfterEnv
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Dec 25, 2023
2 parents e350794 + 8725326 commit b47b539
Show file tree
Hide file tree
Showing 15 changed files with 198 additions and 208 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -60,6 +60,7 @@
- `[jest-cli, jest-config, @jest/types]` [**BREAKING**] Remove deprecated `--init` argument ([#14490](https://github.com/jestjs/jest/pull/14490))
- `[jest-config, @jest/core, jest-util]` Upgrade `ci-info` ([#14655](https://github.com/jestjs/jest/pull/14655))
- `[jest-mock]` [**BREAKING**] Remove `MockFunctionMetadataType`, `MockFunctionMetadata` and `SpyInstance` types ([#14621](https://github.com/jestjs/jest/pull/14621))
- `[jest-schemas]` Upgrade `@sinclair/typebox` ([#14775](https://github.com/jestjs/jest/pull/14775))
- `[jest-transform]` Upgrade `write-file-atomic` ([#14274](https://github.com/jestjs/jest/pull/14274))
- `[jest-util]` Upgrade `picomatch` to v3 ([#14653](https://github.com/jestjs/jest/pull/14653))
- `[docs] Append to NODE_OPTIONS, not overwrite ([#14730](https://github.com/jestjs/jest/pull/14730))`
Expand Down
2 changes: 1 addition & 1 deletion docs/JestObjectAPI.md
Expand Up @@ -753,7 +753,7 @@ afterEach(() => {

test('plays video', () => {
const spy = jest.spyOn(video, 'play', 'get'); // we pass 'get'
const isPlaying = video.play();
const isPlaying = video.play;

expect(spy).toHaveBeenCalled();
expect(isPlaying).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion docs/TestingFrameworks.md
Expand Up @@ -46,4 +46,4 @@ Jest is a universal testing platform, with the ability to adapt to any JavaScrip

## Next.js

- [Jest and React Testing Library](https://nextjs.org/docs/testing#jest-and-react-testing-library) by Next.js docs
- [Jest and React Testing Library](https://nextjs.org/docs/pages/building-your-application/testing/jest) by Next.js docs
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -41,7 +41,7 @@
"eslint-plugin-local": "link:./.eslintplugin",
"eslint-plugin-markdown": "^3.0.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-unicorn": "^49.0.0",
"eslint-plugin-unicorn": "^50.0.0",
"execa": "^5.0.0",
"find-process": "^1.4.1",
"glob": "^10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-schemas/package.json
Expand Up @@ -19,7 +19,7 @@
"./package.json": "./package.json"
},
"dependencies": {
"@sinclair/typebox": "^0.31.0"
"@sinclair/typebox": "^0.32.1"
},
"engines": {
"node": "^16.10.0 || ^18.12.0 || >=20.0.0"
Expand Down
6 changes: 1 addition & 5 deletions tsconfig.json
Expand Up @@ -7,7 +7,6 @@
"composite": true,
"declaration": true,
"emitDeclarationOnly": true,
"importsNotUsedAsValues": "error",
"stripInternal": true,

"strict": true,
Expand All @@ -23,9 +22,6 @@
"esModuleInterop": false,
"isolatedModules": true,
"skipLibCheck": false,
"resolveJsonModule": true,

// TODO: remove for Jest 30
"ignoreDeprecations": "5.0"
"resolveJsonModule": true
}
}
2 changes: 1 addition & 1 deletion website/versioned_docs/version-29.4/JestObjectAPI.md
Expand Up @@ -753,7 +753,7 @@ afterEach(() => {

test('plays video', () => {
const spy = jest.spyOn(video, 'play', 'get'); // we pass 'get'
const isPlaying = video.play();
const isPlaying = video.play;

expect(spy).toHaveBeenCalled();
expect(isPlaying).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion website/versioned_docs/version-29.4/TestingFrameworks.md
Expand Up @@ -46,4 +46,4 @@ Jest is a universal testing platform, with the ability to adapt to any JavaScrip

## Next.js

- [Jest and React Testing Library](https://nextjs.org/docs/testing#jest-and-react-testing-library) by Next.js docs
- [Jest and React Testing Library](https://nextjs.org/docs/pages/building-your-application/testing/jest) by Next.js docs
2 changes: 1 addition & 1 deletion website/versioned_docs/version-29.5/JestObjectAPI.md
Expand Up @@ -753,7 +753,7 @@ afterEach(() => {

test('plays video', () => {
const spy = jest.spyOn(video, 'play', 'get'); // we pass 'get'
const isPlaying = video.play();
const isPlaying = video.play;

expect(spy).toHaveBeenCalled();
expect(isPlaying).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion website/versioned_docs/version-29.5/TestingFrameworks.md
Expand Up @@ -46,4 +46,4 @@ Jest is a universal testing platform, with the ability to adapt to any JavaScrip

## Next.js

- [Jest and React Testing Library](https://nextjs.org/docs/testing#jest-and-react-testing-library) by Next.js docs
- [Jest and React Testing Library](https://nextjs.org/docs/pages/building-your-application/testing/jest) by Next.js docs
2 changes: 1 addition & 1 deletion website/versioned_docs/version-29.6/JestObjectAPI.md
Expand Up @@ -753,7 +753,7 @@ afterEach(() => {

test('plays video', () => {
const spy = jest.spyOn(video, 'play', 'get'); // we pass 'get'
const isPlaying = video.play();
const isPlaying = video.play;

expect(spy).toHaveBeenCalled();
expect(isPlaying).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion website/versioned_docs/version-29.6/TestingFrameworks.md
Expand Up @@ -46,4 +46,4 @@ Jest is a universal testing platform, with the ability to adapt to any JavaScrip

## Next.js

- [Jest and React Testing Library](https://nextjs.org/docs/testing#jest-and-react-testing-library) by Next.js docs
- [Jest and React Testing Library](https://nextjs.org/docs/pages/building-your-application/testing/jest) by Next.js docs
2 changes: 1 addition & 1 deletion website/versioned_docs/version-29.7/JestObjectAPI.md
Expand Up @@ -753,7 +753,7 @@ afterEach(() => {

test('plays video', () => {
const spy = jest.spyOn(video, 'play', 'get'); // we pass 'get'
const isPlaying = video.play();
const isPlaying = video.play;

expect(spy).toHaveBeenCalled();
expect(isPlaying).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion website/versioned_docs/version-29.7/TestingFrameworks.md
Expand Up @@ -46,4 +46,4 @@ Jest is a universal testing platform, with the ability to adapt to any JavaScrip

## Next.js

- [Jest and React Testing Library](https://nextjs.org/docs/testing#jest-and-react-testing-library) by Next.js docs
- [Jest and React Testing Library](https://nextjs.org/docs/pages/building-your-application/testing/jest) by Next.js docs

0 comments on commit b47b539

Please sign in to comment.