test: fix mocha vs jest type conflicts in test files #31049

dbrans · 2025-03-17T14:34:21Z

Description

This PR resolves conflicting types between jest and mocha that were causing issues with the type of "it" in unit tests which were masking type errors. It also fixes type issues that were masked by previously disregarding type errors.

In particular, this PR creates an isolated TypeScript configuration for the e2e tests where they get their own type checking context. Since mocha is only needed in e2e tests, Mocha types will not be considered for files outside of that folder.

Related issues

Fixes:

Manual testing steps

Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

I've followed MetaMask Contributor Docs and MetaMask Extension Coding Standards.
I've completed the PR template to the best of my ability
I’ve included tests if applicable
I’ve documented my code using JSDoc format if applicable
I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.

Pre-merge reviewer checklist

I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

github-actions · 2025-03-17T14:34:36Z

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

…lder

metamaskbot · 2025-03-17T18:03:19Z

Builds ready [2be0d1e]

builds: chrome, firefox
builds (flask): chrome, firefox
builds (MMI): chrome
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Bundle Size Stats
mv2: E2e Actions Stats
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
- content-script: 0
- offscreen: 0

Page Load Metrics (3837 ± 1457 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1497	9986	2996	1762	846
		domContentLoaded	1715	13951	3366	2968	1425
		load	1794	14674	3837	3035	1457
		domInteractive	27	898	103	190	91
		backgroundConnect	106	972	476	270	129
		firstReactRender	42	289	111	69	33
		getState	36	835	216	213	102
		initialActions	0	2	0	1	0
		loadScripts	1240	12171	2527	2540	1219
		setupStore	18	750	145	174	83
		uiStartup	2511	22106	6770	5137	2467

Bundle size diffs

background: 0 Bytes (0.00%)
ui: 0 Bytes (0.00%)
common: 0 Bytes (0.00%)

app/scripts/lib/multichain/address.test.ts

package.json

ui/hooks/ramps/useRamps/useRamps.test.tsx

metamaskbot · 2025-03-27T12:46:19Z

Builds ready [c2f5ea8]

builds: chrome, firefox
builds (flask): chrome, firefox
builds (MMI): chrome
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
mv3: Bundle Size Stats
mv2: E2e Actions Stats
storybook: Storybook
typescript migration: Dashboard
all artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
- content-script: 0
- offscreen: 0

Page Load Metrics (2750 ± 853 ms)

Platform	Page	Metric	Min (ms)	Max (ms)	Average (ms)	StandardDeviation (ms)	MarginOfError (ms)
Chrome	Home	firstPaint	1667	8850	2569	1562	750
		domContentLoaded	1608	8592	2370	1519	729
		load	1707	9946	2750	1777	853
		domInteractive	24	182	60	44	21
		backgroundConnect	90	1341	389	290	139
		firstReactRender	30	396	109	77	37
		getState	25	546	175	124	59
		initialActions	0	1	0	0	0
		loadScripts	1163	7016	1702	1256	603
		setupStore	19	542	135	143	69
		uiStartup	2162	11045	4767	2245	1078

Bundle size diffs

background: 0 Bytes (0.00%)
ui: 0 Bytes (0.00%)
common: 0 Bytes (0.00%)

metamaskbot · 2025-03-28T14:56:08Z

✨ Files requiring CODEOWNER review ✨

🔑 @MetaMask/accounts-engineers

app/scripts/lib/snap-keyring/keyring-snaps-permissions.test.ts
app/scripts/lib/snap-keyring/utils/isBlockedUrl.test.ts

✅ @MetaMask/confirmations

app/scripts/lib/ppom/ppom-util.test.ts

🔄 @MetaMask/swaps-engineers

app/scripts/controllers/bridge-status/validators.test.ts
ui/hooks/bridge/useBridging.test.ts

ccharly

Reviewed only for the accounts team related files:

app/scripts/lib/snap-keyring/keyring-snaps-permissions.test.ts
app/scripts/lib/snap-keyring/utils/isBlockedUrl.test.ts

metamaskbot · 2025-03-28T15:31:02Z

Builds ready [e9981a2]

builds: chrome, firefox
builds (flask): chrome, firefox
builds (test): chrome, firefox
builds (test-flask): chrome, firefox
build viz: Build System
bundle size: Bundle Size Stats
user-actions-benchmark: User Actions Stats
storybook: Storybook
typescript migration: Dashboard
all CircleCI artifacts
bundle viz:
- background: 0, 1, 2, 3, 4, 5, 6, 7, 8
- common: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
- ui: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
- content-script: 0
- offscreen: 0

UI Startup Metrics (1173 ± 58 ms)

Platform	BuildType	Page	Metric	Mean (ms)	Min (ms)	Max (ms)	Std Dev (ms)	P 75 (ms)	P 95 (ms)
Chrome	Browserify	Home	uiStartup	1173	1065	1315	58	1210	1289
			load	1023	894	1162	59	950	991
			domContentLoaded	1017	887	1157	59	952	991
			domInteractive	16	13	28	4	15	26
			firstPaint	722	159	1169	402	248	988
			backgroundConnect	9	6	45	5	9	10
			firstReactRender	19	15	49	6	19	33
			getState	10	4	31	7	6	8
			initialActions	0	0	1	0	0	1
			loadScripts	808	676	945	58	854	922
			setupStore	7	4	22	3	7	8
	Webpack	Home	uiStartup	953	840	1230	82	953	970
			load	813	584	967	59	838	917
			domContentLoaded	808	566	958	59	834	906
			domInteractive	15	12	35	6	13	33
			firstPaint	465	55	929	340	826	873
			backgroundConnect	16	11	52	8	14	38
			firstReactRender	14	12	35	4	13	26
			getState	6	4	12	2	7	8
			initialActions	0	0	1	0	0	0
			loadScripts	805	556	948	58	833	896
			setupStore	7	5	15	2	7	9
Firefox	Browserify	Home	uiStartup	1367	1172	1974	153	1387	1703
			load	1229	1056	1819	148	1250	1552
			domContentLoaded	1229	1056	1819	148	1250	1552
			domInteractive	99	38	183	29	87	97
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	24	16	89	9	27	37
			firstReactRender	22	18	31	3	24	28
			getState	7	4	26	3	7	9
			initialActions	0	0	1	0	0	1
			loadScripts	1207	1037	1781	145	1229	1529
			setupStore	7	4	51	6	5	7
	Webpack	Home	uiStartup	1005	853	1567	177	911	981
			load	879	746	1361	156	803	941
			domContentLoaded	879	746	1361	156	803	941
			domInteractive	117	37	273	31	149	86
			firstPaint	NaN	NaN	NaN	NaN	NaN	NaN
			backgroundConnect	22	13	94	13	23	42
			firstReactRender	19	16	29	2	19	25
			getState	10	4	75	13	75	9
			initialActions	0	0	1	0	0	1
			loadScripts	861	733	1329	152	794	962
			setupStore	8	5	86	9	8	9

Bundle size diffs

background: 0 Bytes (0%)
ui: 0 Bytes (0%)
common: 0 Bytes (0%)

wachunei

Ramp changes LGTM

dbrans added 2 commits March 17, 2025 10:27

separate tsconfig for e2e tests

4d11a9f

remove all ts-expect-error and fix type errors

2a8032f

metamaskbot added the team-extension-platform Extension Platform team label Mar 17, 2025

dbrans added 5 commits March 17, 2025 10:38

lint fix

389d509

removing additional ts-expect-error and fixing types

126a5e6

fixing types

869ac37

remove explicit type definitions to include all those in the types fo…

5682fd2

…lder

Merge branch 'main' into djb/e2e-tsconfig

2be0d1e

dbrans marked this pull request as ready for review March 17, 2025 17:34

dbrans requested review from a team as code owners March 17, 2025 17:34

dbrans changed the title ~~test: resolve jest.It.each type and create separate tsconfig for e2e tests~~ test: fix mocha vs jest type conflicts in test files Mar 17, 2025

davidmurdoch reviewed Mar 17, 2025

View reviewed changes

app/scripts/lib/multichain/address.test.ts Outdated Show resolved Hide resolved

package.json Outdated Show resolved Hide resolved

ui/hooks/ramps/useRamps/useRamps.test.tsx Outdated Show resolved Hide resolved

dbrans added 5 commits March 18, 2025 11:13

improve address tests

aca9300

Merge remote-tracking branch 'origin/main' into djb/e2e-tsconfig

847e1f4

lint

4615c5b

Merge branch 'main' into djb/e2e-tsconfig

5297193

Merge remote-tracking branch 'origin/main' into djb/e2e-tsconfig

c2f5ea8

dbrans requested review from davidmurdoch and matthewwalsh0 March 27, 2025 12:09

dbrans enabled auto-merge March 27, 2025 15:13

Merge remote-tracking branch 'origin/main' into djb/e2e-tsconfig

e9981a2

pedronfigueiredo approved these changes Mar 28, 2025

View reviewed changes

ccharly approved these changes Mar 28, 2025

View reviewed changes

micaelae approved these changes Mar 28, 2025

View reviewed changes

davidmurdoch approved these changes Mar 28, 2025

View reviewed changes

GustavoRSSilva approved these changes Mar 28, 2025

View reviewed changes

dbrans removed the request for review from matthewwalsh0 March 28, 2025 17:13

wachunei approved these changes Mar 28, 2025

View reviewed changes

dbrans added this pull request to the merge queue Mar 28, 2025

Merged via the queue into main with commit 1e87559 Mar 28, 2025
147 checks passed

dbrans deleted the djb/e2e-tsconfig branch March 28, 2025 19:00

github-actions bot locked and limited conversation to collaborators Mar 28, 2025

metamaskbot added the release-12.17.0 Issue or pull request that will be included in release 12.17.0 label Mar 28, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

test: fix mocha vs jest type conflicts in test files #31049

test: fix mocha vs jest type conflicts in test files #31049

Uh oh!

dbrans commented Mar 17, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Mar 17, 2025

Uh oh!

metamaskbot commented Mar 17, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

metamaskbot commented Mar 27, 2025

Uh oh!

metamaskbot commented Mar 28, 2025

Uh oh!

ccharly left a comment

Uh oh!

metamaskbot commented Mar 28, 2025

Uh oh!

wachunei left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

test: fix mocha vs jest type conflicts in test files #31049

test: fix mocha vs jest type conflicts in test files #31049

Uh oh!

Conversation

dbrans commented Mar 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related issues

Manual testing steps

Screenshots/Recordings

Before

After

Pre-merge author checklist

Pre-merge reviewer checklist

Uh oh!

github-actions bot commented Mar 17, 2025

Uh oh!

metamaskbot commented Mar 17, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

metamaskbot commented Mar 27, 2025

Uh oh!

metamaskbot commented Mar 28, 2025

✨ Files requiring CODEOWNER review ✨

Uh oh!

ccharly left a comment

Choose a reason for hiding this comment

Uh oh!

metamaskbot commented Mar 28, 2025

Uh oh!

wachunei left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

dbrans commented Mar 17, 2025 •

edited

Loading