Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 9 additions & 14 deletions oxlint-suppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -492,11 +492,6 @@
"count": 5
}
},
"packages/announcement-controller/jest.config.cjs": {
"import/unambiguous": {
"count": 1
}
},
"packages/app-metadata-controller/jest.config.cjs": {
"import/unambiguous": {
"count": 1
Expand Down Expand Up @@ -1996,19 +1991,19 @@
"count": 1
}
},
"packages/client-utils/jest.config.cjs": {
"import/unambiguous": {
"count": 1
}
},
"packages/client-utils/src/mappers/api-transaction-mapper.test.ts": {
"typescript/no-unsafe-member-access": {
"count": 1
"vitest/no-conditional-in-test": {
"count": 2
}
},
"packages/client-utils/src/mappers/local-transaction-mapper.test.ts": {
"typescript/no-unsafe-member-access": {
"count": 1
"vitest/no-conditional-in-test": {
"count": 19
}
},
"packages/client-utils/src/mappers/ramps-order-mapper.test.ts": {
"vitest/no-conditional-in-test": {
"count": 3
}
},
"packages/compliance-controller/jest.config.cjs": {
Expand Down
26 changes: 0 additions & 26 deletions packages/announcement-controller/jest.config.cjs

This file was deleted.

15 changes: 6 additions & 9 deletions packages/announcement-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,23 @@
"messenger-action-types:check": "node --import ../../scripts/resolver/register.ts --experimental-transform-types ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
"messenger-action-types:generate": "node --import ../../scripts/resolver/register.ts --experimental-transform-types ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
"test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
"test": "vitest",
"test:clean": "vitest --clearCache",
"test:verbose": "vitest --reporter=verbose",
"test:watch": "vitest --watch"
},
"dependencies": {
"@metamask/base-controller": "^10.1.0",
"@metamask/messenger": "^3.0.0"
},
"devDependencies": {
"@metamask/auto-changelog": "^6.2.1",
"@types/jest": "^30.0.0",
"@typescript/native": "npm:typescript@^7.0.2",
"deepmerge": "^4.3.1",
"jest": "^30.5.2",
"rimraf": "^6.1.3",
"ts-jest": "^29.4.14",
"typedoc": "^0.28.20",
"typedoc-plugin-missing-exports": "^4.1.4",
"typescript": "npm:@typescript/typescript6@^6.0.2"
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vitest": "^5.0.0"
},
"engines": {
"node": "^22.14.0 || ^24"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { deriveStateFromMetadata } from '@metamask/base-controller';
import { Messenger, MOCK_ANY_NAMESPACE } from '@metamask/messenger';
import type { MockAnyNamespace } from '@metamask/messenger';
import { describe, expect, it } from 'vitest';

import type {
AnnouncementControllerState,
Expand Down
3 changes: 0 additions & 3 deletions packages/announcement-controller/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"extends": "../../tsconfig.packages.json",
"compilerOptions": {
"types": ["jest"]
},
"references": [
{
"path": "../base-controller"
Expand Down
23 changes: 23 additions & 0 deletions packages/announcement-controller/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { basename, dirname } from 'node:path';
import { fileURLToPath } from 'node:url';
import { defineConfig, mergeConfig } from 'vitest/config';

import baseConfig from '../../vitest.config.packages.js';

export default mergeConfig(
baseConfig,
defineConfig({
test: {
name: basename(dirname(fileURLToPath(import.meta.url))),

coverage: {
thresholds: {
branches: 100,
functions: 100,
lines: 100,
statements: 100,
},
},
},
}),
);
32 changes: 0 additions & 32 deletions packages/client-utils/jest.config.cjs

This file was deleted.

15 changes: 6 additions & 9 deletions packages/client-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"messenger-action-types:check": "node --import ../../scripts/resolver/register.ts --experimental-transform-types ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
"messenger-action-types:generate": "node --import ../../scripts/resolver/register.ts --experimental-transform-types ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
"test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
"test": "vitest",
"test:clean": "vitest --clearCache",
"test:verbose": "vitest --reporter=verbose",
"test:watch": "vitest --watch"
},
"dependencies": {
"@metamask/contract-metadata": "^2.5.0",
Expand All @@ -62,15 +62,12 @@
"devDependencies": {
"@ethersproject/abi": "^5.7.0",
"@metamask/auto-changelog": "^6.2.1",
"@types/jest": "^30.0.0",
"@typescript/native": "npm:typescript@^7.0.2",
"deepmerge": "^4.3.1",
"jest": "^30.5.2",
"rimraf": "^6.1.3",
"ts-jest": "^29.4.14",
"typedoc": "^0.28.20",
"typedoc-plugin-missing-exports": "^4.1.4",
"typescript": "npm:@typescript/typescript6@^6.0.2"
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vitest": "^5.0.0"
},
"engines": {
"node": "^22.14.0 || ^24"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe, expect, it, vi } from 'vitest';

import { createFormatters } from './create-formatters.js';

const locale = 'en-US';
Expand Down Expand Up @@ -74,7 +76,7 @@ describe('formatCurrency', () => {
it('re-throws non-RangeError errors from Intl.NumberFormat', () => {
const original = Intl.NumberFormat;
const typeError = new TypeError('unexpected');
Intl.NumberFormat = jest.fn().mockImplementation(() => {
Intl.NumberFormat = vi.fn().mockImplementation(function () {
throw typeError;
}) as unknown as typeof Intl.NumberFormat;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { describe, expect, it, vi } from 'vitest';

import { apiTransactionFixtures } from '../../test/fixtures/api-transactions.js';
import { mapApiTransaction } from './api-transaction-mapper.js';
import { formatAddressToAssetId } from './helpers/caip.js';

// Mock known-token lookup with the deterministic test table in `test/`.
jest.mock('./helpers/token-metadata', () => ({
getKnownTokenMetadata: jest.requireActual('../../test/test-helpers')
vi.mock(import('./helpers/token-metadata.js'), async () => ({
getKnownTokenMetadata: (await import('../../test/test-helpers.js'))
.getKnownTokenMetadata,
}));

Expand Down
7 changes: 4 additions & 3 deletions packages/client-utils/src/mappers/helpers/caip.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { getChainById } from 'eth-chainlist';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import {
formatAddressToAssetId,
Expand All @@ -7,11 +8,11 @@ import {
resolveNativeAssetId,
} from './caip.js';

jest.mock('eth-chainlist', () => ({
getChainById: jest.fn(),
vi.mock(import('eth-chainlist'), () => ({
getChainById: vi.fn(),
}));

const mockGetChainById = jest.mocked(getChainById);
const mockGetChainById = vi.mocked(getChainById);

describe('caip helpers', () => {
beforeEach(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import { getKnownTokenMetadata } from './token-metadata.js';

describe('getKnownTokenMetadata', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { TransactionStatus } from '@metamask/transaction-controller';
import type { TransactionMeta } from '@metamask/transaction-controller';
import { afterEach, describe, expect, it, vi } from 'vitest';

import * as tokenMetadata from './token-metadata.js';
import {
Expand Down Expand Up @@ -28,7 +29,7 @@ const MANTLE_TRANSACTION: TransactionMeta = {

describe('transaction helpers', () => {
afterEach(() => {
jest.restoreAllMocks();
vi.restoreAllMocks();
});

describe('isNftStandard', () => {
Expand Down Expand Up @@ -318,7 +319,7 @@ describe('transaction helpers', () => {

describe('getTokenMetadataFromKnownToken', () => {
it('returns metadata without a symbol when it is missing', () => {
jest.spyOn(tokenMetadata, 'getKnownTokenMetadata').mockReturnValue({
vi.spyOn(tokenMetadata, 'getKnownTokenMetadata').mockReturnValue({
decimals: 18,
assetId: 'eip155:1/erc20:0x1111111111111111111111111111111111111111',
});
Expand All @@ -338,7 +339,7 @@ describe('transaction helpers', () => {
});

it('returns partial metadata when some fields are missing', () => {
jest.spyOn(tokenMetadata, 'getKnownTokenMetadata').mockReturnValue({
vi.spyOn(tokenMetadata, 'getKnownTokenMetadata').mockReturnValue({
symbol: 'TKN',
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { SolScope } from '@metamask/keyring-api';
import { describe, expect, it } from 'vitest';

import { keyringTransactionFixtures } from '../../test/fixtures/keyring-transactions.js';
import { mapKeyringTransaction } from './keyring-transaction-mapper.js';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { TransactionType } from '@metamask/transaction-controller';
import { afterEach, describe, expect, it, vi } from 'vitest';

import { localTransactionFixtures } from '../../test/fixtures/local-transactions.js';
import type { ActivityItem } from '../types.js';
import * as caip from './helpers/caip.js';
import { formatAddressToAssetId } from './helpers/caip.js';
import { mapLocalTransaction } from './local-transaction-mapper.js';

jest.mock('./helpers/token-metadata', () => ({
getKnownTokenMetadata: jest.requireActual('../../test/test-helpers')
vi.mock(import('./helpers/token-metadata.js'), async () => ({
getKnownTokenMetadata: (await import('../../test/test-helpers.js'))
.getKnownTokenMetadata,
}));

Expand All @@ -27,7 +28,7 @@ const mapLocal = (input: unknown): ActivityItem =>

describe('mapLocalTransaction', () => {
afterEach(() => {
jest.restoreAllMocks();
vi.restoreAllMocks();
});
it('maps a pending native send to a Send activity', () => {
const item = mapLocal(
Expand Down Expand Up @@ -1335,7 +1336,7 @@ describe('mapLocalTransaction', () => {
});

it('omits native assetId when resolveNativeAssetId returns undefined', () => {
jest.spyOn(caip, 'resolveNativeAssetId').mockReturnValue(undefined);
vi.spyOn(caip, 'resolveNativeAssetId').mockReturnValue(undefined);

const item = mapLocal({
...localTransactionFixtures.mapInputs.mapsAPendingNativeSendTo,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import type { RampsOrderLike } from './ramps-order-mapper.js';
import { mapRampsOrder } from './ramps-order-mapper.js';

Expand Down
3 changes: 0 additions & 3 deletions packages/client-utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"extends": "../../tsconfig.packages.json",
"compilerOptions": {
"types": ["jest"]
},
"references": [
{
"path": "../controller-utils"
Expand Down
23 changes: 23 additions & 0 deletions packages/client-utils/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { basename, dirname } from 'node:path';
import { fileURLToPath } from 'node:url';
import { defineConfig, mergeConfig } from 'vitest/config';

import baseConfig from '../../vitest.config.packages.js';

export default mergeConfig(
baseConfig,
defineConfig({
test: {
name: basename(dirname(fileURLToPath(import.meta.url))),

coverage: {
thresholds: {
branches: 99.82,
functions: 100,
lines: 100,
statements: 100,
},
},
},
}),
);
2 changes: 0 additions & 2 deletions test-runner-package-map.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const PACKAGES_ON_JEST = new Set([
'@metamask/advanced-chart-core',
'@metamask/analytics-controller',
'@metamask/analytics-data-regulation-controller',
'@metamask/announcement-controller',
'@metamask/app-metadata-controller',
'@metamask/assets-controller',
'@metamask/assets-controllers',
Expand All @@ -17,7 +16,6 @@ const PACKAGES_ON_JEST = new Set([
'@metamask/build-utils',
'@metamask/chain-agnostic-permission',
'@metamask/client-controller',
'@metamask/client-utils',
'@metamask/compliance-controller',
'@metamask/composable-controller',
'@metamask/config-registry-controller',
Expand Down
Loading
Loading