Skip to content

Commit 0298e89

Browse files
cryptodev-2scryptodev-2s
committed
chore: update to Jest 29 and fix tests
- Update all packages to use Jest 29 - Update root configuration and yarn.lock - Fix ts-jest configuration for Jest 29 - Fix TypeScript errors in UserOperationController tests - Update snapshots for Jest 29 format changes - Increase test timeout to 30s to prevent flakes
1 parent c61401a commit 0298e89

File tree

153 files changed

+4482
-4196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+4482
-4196
lines changed

‎jest.config.packages.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,17 @@ module.exports = {
102102
// notifyMode: "failure-change",
103103

104104
// A preset that is used as a base for Jest's configuration
105-
preset: 'ts-jest',
105+
preset: 'ts-jest/presets/default',
106+
transform: {
107+
'^.+\\.tsx?$': [
108+
'ts-jest',
109+
{
110+
diagnostics: {
111+
ignoreCodes: [151002],
112+
},
113+
},
114+
],
115+
},
106116

107117
// The path to the Prettier executable used to format snapshots
108118
// Jest doesn't support Prettier 3 yet, so we use Prettier 2
@@ -184,7 +194,7 @@ module.exports = {
184194
// testRunner: "jest-circus/runner",
185195

186196
// Default timeout of a test in milliseconds.
187-
// testTimeout: 5000,
197+
testTimeout: 30000,
188198

189199
// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
190200
// testURL: "http://localhost",

‎package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,28 @@
6767
"@metamask/network-controller": "^25.0.0",
6868
"@metamask/utils": "^11.8.1",
6969
"@ts-bridge/cli": "^0.6.4",
70-
"@types/jest": "^28.0.0",
70+
"@types/jest": "^30.0.0",
7171
"@types/lodash": "^4.14.191",
7272
"@types/node": "^16.18.54",
7373
"@types/semver": "^7",
7474
"@typescript-eslint/eslint-plugin": "^8.7.0",
7575
"@typescript-eslint/parser": "^8.7.0",
7676
"@yarnpkg/types": "^4.0.0",
77-
"babel-jest": "^29.7.0",
77+
"babel-jest": "^30.0.0",
7878
"depcheck": "^1.4.7",
7979
"eslint": "^9.39.1",
8080
"eslint-config-prettier": "^9.1.0",
8181
"eslint-import-resolver-typescript": "^3.6.3",
8282
"eslint-plugin-import-x": "^4.3.0",
83-
"eslint-plugin-jest": "^28.8.3",
83+
"eslint-plugin-jest": "^29.2.0",
8484
"eslint-plugin-jsdoc": "^50.2.4",
8585
"eslint-plugin-n": "^17.10.3",
8686
"eslint-plugin-prettier": "^5.2.1",
8787
"eslint-plugin-promise": "^7.1.0",
8888
"execa": "^5.0.0",
8989
"isomorphic-fetch": "^3.0.0",
90-
"jest": "^28.0.0",
91-
"jest-environment-node": "^29.0.0",
90+
"jest": "^30.0.0",
91+
"jest-environment-node": "^30.0.0",
9292
"jest-silent-reporter": "^0.5.0",
9393
"lodash": "^4.17.21",
9494
"nock": "^13.3.1",
@@ -114,7 +114,8 @@
114114
"@keystonehq/bc-ur-registry-eth>hdkey>secp256k1": true,
115115
"babel-runtime>core-js": false,
116116
"simple-git-hooks": false,
117-
"tsx>esbuild": false
117+
"tsx>esbuild": false,
118+
"jest>@jest/core>jest-resolve>unrs-resolver": false
118119
}
119120
}
120121
}

‎packages/account-tree-controller/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@
6868
"@metamask/providers": "^22.1.0",
6969
"@metamask/snaps-controllers": "^14.0.1",
7070
"@ts-bridge/cli": "^0.6.4",
71-
"@types/jest": "^28.0.0",
71+
"@types/jest": "^30.0.0",
7272
"deepmerge": "^4.2.2",
73-
"jest": "^28.0.0",
74-
"ts-jest": "^28.0.0",
73+
"jest": "^30.0.0",
74+
"ts-jest": "^29.4.0",
7575
"typedoc": "^0.24.8",
7676
"typedoc-plugin-missing-exports": "^2.0.0",
7777
"typescript": "~5.3.3",

‎packages/account-tree-controller/src/AccountTreeController.test.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4276,7 +4276,7 @@ describe('AccountTreeController', () => {
42764276
controller.metadata,
42774277
'includeInDebugSnapshot',
42784278
),
4279-
).toMatchInlineSnapshot(`Object {}`);
4279+
).toMatchInlineSnapshot(`{}`);
42804280
});
42814281

42824282
it('includes expected state in state logs', () => {
@@ -4289,13 +4289,13 @@ describe('AccountTreeController', () => {
42894289
'includeInStateLogs',
42904290
),
42914291
).toMatchInlineSnapshot(`
4292-
Object {
4293-
"accountGroupsMetadata": Object {},
4294-
"accountTree": Object {
4292+
{
4293+
"accountGroupsMetadata": {},
4294+
"accountTree": {
42954295
"selectedAccountGroup": "",
4296-
"wallets": Object {},
4296+
"wallets": {},
42974297
},
4298-
"accountWalletsMetadata": Object {},
4298+
"accountWalletsMetadata": {},
42994299
"hasAccountTreeSyncingSyncedAtLeastOnce": false,
43004300
}
43014301
`);
@@ -4311,9 +4311,9 @@ describe('AccountTreeController', () => {
43114311
'persist',
43124312
),
43134313
).toMatchInlineSnapshot(`
4314-
Object {
4315-
"accountGroupsMetadata": Object {},
4316-
"accountWalletsMetadata": Object {},
4314+
{
4315+
"accountGroupsMetadata": {},
4316+
"accountWalletsMetadata": {},
43174317
"hasAccountTreeSyncingSyncedAtLeastOnce": false,
43184318
}
43194319
`);
@@ -4329,13 +4329,13 @@ describe('AccountTreeController', () => {
43294329
'usedInUi',
43304330
),
43314331
).toMatchInlineSnapshot(`
4332-
Object {
4333-
"accountGroupsMetadata": Object {},
4334-
"accountTree": Object {
4332+
{
4333+
"accountGroupsMetadata": {},
4334+
"accountTree": {
43354335
"selectedAccountGroup": "",
4336-
"wallets": Object {},
4336+
"wallets": {},
43374337
},
4338-
"accountWalletsMetadata": Object {},
4338+
"accountWalletsMetadata": {},
43394339
"hasAccountTreeSyncingSyncedAtLeastOnce": false,
43404340
"isAccountTreeSyncingInProgress": false,
43414341
}

‎packages/accounts-controller/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373
"@metamask/providers": "^22.1.0",
7474
"@metamask/snaps-controllers": "^14.0.1",
7575
"@ts-bridge/cli": "^0.6.4",
76-
"@types/jest": "^28.0.0",
76+
"@types/jest": "^30.0.0",
7777
"@types/readable-stream": "^2.3.0",
78-
"jest": "^28.0.0",
79-
"ts-jest": "^28.0.0",
78+
"jest": "^30.0.0",
79+
"ts-jest": "^29.4.0",
8080
"typedoc": "^0.24.8",
8181
"typedoc-plugin-missing-exports": "^2.0.0",
8282
"typescript": "~5.3.3",

‎packages/accounts-controller/src/AccountsController.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3954,7 +3954,7 @@ describe('AccountsController', () => {
39543954
controller.metadata,
39553955
'includeInDebugSnapshot',
39563956
),
3957-
).toMatchInlineSnapshot(`Object {}`);
3957+
).toMatchInlineSnapshot(`{}`);
39583958
});
39593959

39603960
it('includes expected state in state logs', () => {
@@ -3967,9 +3967,9 @@ describe('AccountsController', () => {
39673967
'includeInStateLogs',
39683968
),
39693969
).toMatchInlineSnapshot(`
3970-
Object {
3971-
"internalAccounts": Object {
3972-
"accounts": Object {},
3970+
{
3971+
"internalAccounts": {
3972+
"accounts": {},
39733973
"selectedAccount": "",
39743974
},
39753975
}
@@ -3986,9 +3986,9 @@ describe('AccountsController', () => {
39863986
'persist',
39873987
),
39883988
).toMatchInlineSnapshot(`
3989-
Object {
3990-
"internalAccounts": Object {
3991-
"accounts": Object {},
3989+
{
3990+
"internalAccounts": {
3991+
"accounts": {},
39923992
"selectedAccount": "",
39933993
},
39943994
}
@@ -4005,9 +4005,9 @@ describe('AccountsController', () => {
40054005
'usedInUi',
40064006
),
40074007
).toMatchInlineSnapshot(`
4008-
Object {
4009-
"internalAccounts": Object {
4010-
"accounts": Object {},
4008+
{
4009+
"internalAccounts": {
4010+
"accounts": {},
40114011
"selectedAccount": "",
40124012
},
40134013
}

‎packages/address-book-controller/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
"devDependencies": {
5757
"@metamask/auto-changelog": "^3.4.4",
5858
"@ts-bridge/cli": "^0.6.4",
59-
"@types/jest": "^28.0.0",
59+
"@types/jest": "^30.0.0",
6060
"deepmerge": "^4.2.2",
61-
"jest": "^28.0.0",
62-
"ts-jest": "^28.0.0",
61+
"jest": "^30.0.0",
62+
"ts-jest": "^29.4.0",
6363
"typedoc": "^0.24.8",
6464
"typedoc-plugin-missing-exports": "^2.0.0",
6565
"typescript": "~5.3.3"

‎packages/address-book-controller/src/AddressBookController.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ describe('AddressBookController', () => {
650650
controller.metadata,
651651
'includeInDebugSnapshot',
652652
),
653-
).toMatchInlineSnapshot(`Object {}`);
653+
).toMatchInlineSnapshot(`{}`);
654654
});
655655

656656
it('includes expected state in state logs', () => {
@@ -663,8 +663,8 @@ describe('AddressBookController', () => {
663663
'includeInStateLogs',
664664
),
665665
).toMatchInlineSnapshot(`
666-
Object {
667-
"addressBook": Object {},
666+
{
667+
"addressBook": {},
668668
}
669669
`);
670670
});
@@ -679,8 +679,8 @@ describe('AddressBookController', () => {
679679
'persist',
680680
),
681681
).toMatchInlineSnapshot(`
682-
Object {
683-
"addressBook": Object {},
682+
{
683+
"addressBook": {},
684684
}
685685
`);
686686
});
@@ -695,8 +695,8 @@ describe('AddressBookController', () => {
695695
'usedInUi',
696696
),
697697
).toMatchInlineSnapshot(`
698-
Object {
699-
"addressBook": Object {},
698+
{
699+
"addressBook": {},
700700
}
701701
`);
702702
});

‎packages/analytics-controller/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
"devDependencies": {
5757
"@metamask/auto-changelog": "^3.4.4",
5858
"@ts-bridge/cli": "^0.6.4",
59-
"@types/jest": "^28.0.0",
59+
"@types/jest": "^30.0.0",
6060
"deepmerge": "^4.2.2",
61-
"jest": "^28.0.0",
62-
"ts-jest": "^28.0.0",
61+
"jest": "^30.0.0",
62+
"ts-jest": "^29.4.0",
6363
"typedoc": "^0.24.8",
6464
"typedoc-plugin-missing-exports": "^2.0.0",
6565
"typescript": "~5.3.3"

‎packages/announcement-controller/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
"devDependencies": {
5555
"@metamask/auto-changelog": "^3.4.4",
5656
"@ts-bridge/cli": "^0.6.4",
57-
"@types/jest": "^28.0.0",
57+
"@types/jest": "^30.0.0",
5858
"deepmerge": "^4.2.2",
59-
"jest": "^28.0.0",
60-
"ts-jest": "^28.0.0",
59+
"jest": "^30.0.0",
60+
"ts-jest": "^29.4.0",
6161
"typedoc": "^0.24.8",
6262
"typedoc-plugin-missing-exports": "^2.0.0",
6363
"typescript": "~5.3.3"

0 commit comments

Comments
 (0)