Skip to content

chore: upgrade nock from v13 to v14 #7949

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

Draft
cryptodev-2s wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: upgrade nock from v13 to v14 #7949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,10 @@
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^7.1.0",
"execa": "^5.0.0",
"isomorphic-fetch": "^3.0.0",
"jest": "^29.7.0",
"jest-silent-reporter": "^0.5.0",
"lodash": "^4.17.21",
"nock": "^13.3.1",
"nock": "^14.0.11",
"prettier": "^3.3.3",
"prettier-2": "npm:prettier@^2.8.8",
"prettier-plugin-packagejson": "^2.4.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics-data-regulation-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@types/jest": "^29.5.14",
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/assets-controllers/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ module.exports = merge(baseConfig, {
},

// We rely on `window` to make requests
testEnvironment: '<rootDir>/jest.environment.js',
testEnvironment: '../../tests/jest-environment-jsdom.js',
});
17 changes: 0 additions & 17 deletions packages/assets-controllers/jest.environment.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/assets-controllers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lodash": "^4.17.21",
"nock": "^13.3.1",
"nock": "^14.0.11",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
"typedoc-plugin-missing-exports": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-status-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lodash": "^4.17.21",
"nock": "^13.3.1",
"nock": "^14.0.11",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
"typedoc-plugin-missing-exports": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/controller-utils/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ module.exports = merge(baseConfig, {
},

// We rely on `window` to make requests
testEnvironment: '<rootDir>/jest.environment.js',
testEnvironment: '../../tests/jest-environment-jsdom.js',
});
19 changes: 0 additions & 19 deletions packages/controller-utils/jest.environment.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/controller-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
Expand Down
3 changes: 1 addition & 2 deletions packages/core-backend/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ module.exports = merge(baseConfig, {
displayName,

// Use jsdom for BackendWebSocketService tests
testEnvironment: 'jsdom',
testEnvironmentOptions: {},
testEnvironment: '../../tests/jest-environment-jsdom.js',

// An object that configures minimum threshold enforcement for coverage results
coverageThreshold: {
Expand Down
2 changes: 1 addition & 1 deletion packages/foundryup/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@types/yargs-parser": "^21.0.3",
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
"typedoc-plugin-missing-exports": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/foundryup/src/foundryup.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ describe('foundryup', () => {
Architecture.Amd64,
);
await expect(result).rejects.toThrow(
'Request to https://example.com/binaries.zip failed. Status Code: 500 - null',
'Request to https://example.com/binaries.zip failed. Status Code: 500 - Internal Server Error',
);
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/gas-fee-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"jest-when": "^3.4.2",
"nock": "^13.3.1",
"nock": "^14.0.11",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/multichain-network-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"deepmerge": "^4.2.2",
"immer": "^9.0.6",
"jest": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
"typedoc-plugin-missing-exports": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/network-controller/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ module.exports = merge(baseConfig, {

// Currently the tests for NetworkController have a race condition which
// causes intermittent failures. This seems to fix it.
testEnvironment: 'jsdom',
testEnvironment: '../../tests/jest-environment-jsdom.js',
});
2 changes: 1 addition & 1 deletion packages/network-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"jest-environment-jsdom": "^29.7.0",
"jest-when": "^3.4.2",
"lodash": "^4.17.21",
"nock": "^13.3.1",
"nock": "^14.0.11",
"node-fetch": "^2.7.0",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
Expand Down
4 changes: 1 addition & 3 deletions packages/network-controller/src/rpc-service/rpc-service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,7 @@ describe('RpcService', () => {
code: -32700,
message: 'RPC endpoint did not return JSON.',
}),
expectedOnBreakError: expect.objectContaining({
message: expect.stringContaining('invalid json'),
}),
expectedOnBreakError: expect.any(SyntaxError),
});
},
);
Expand Down
8 changes: 4 additions & 4 deletions packages/network-controller/tests/network-client/block-hash-in-response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,9 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(
}),
failure: error,
isRetriableFailure: true,
getExpectedError: (url: string) =>
getExpectedError: () =>
expect.objectContaining({
message: `request to ${url} failed, reason: ${errorCode}`,
message: expect.stringContaining(errorCode),
}),
});
},
Expand Down Expand Up @@ -806,9 +806,9 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(
}),
failure: error,
isRetriableFailure: true,
getExpectedError: (url: string) =>
getExpectedError: () =>
expect.objectContaining({
message: `request to ${url} failed, reason: ${error.message}`,
message: expect.stringContaining(error.message),
}),
});
});
Expand Down
8 changes: 4 additions & 4 deletions packages/network-controller/tests/network-client/block-param.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,9 +798,9 @@ export function testsForRpcMethodSupportingBlockParam(
},
failure: error,
isRetriableFailure: true,
getExpectedError: (url: string) =>
getExpectedError: () =>
expect.objectContaining({
message: `request to ${url} failed, reason: ${errorCode}`,
message: expect.stringContaining(errorCode),
}),
});
},
Expand Down Expand Up @@ -1048,9 +1048,9 @@ export function testsForRpcMethodSupportingBlockParam(
},
failure: error,
isRetriableFailure: true,
getExpectedError: (url: string) =>
getExpectedError: () =>
expect.objectContaining({
message: `request to ${url} failed, reason: ${error.message}`,
message: expect.stringContaining(error.message),
}),
});
});
Expand Down
8 changes: 4 additions & 4 deletions packages/network-controller/tests/network-client/no-block-param.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,9 +577,9 @@ export function testsForRpcMethodAssumingNoBlockParam(
}),
failure: error,
isRetriableFailure: true,
getExpectedError: (url: string) =>
getExpectedError: () =>
expect.objectContaining({
message: `request to ${url} failed, reason: ${errorCode}`,
message: expect.stringContaining(errorCode),
}),
});
},
Expand Down Expand Up @@ -759,9 +759,9 @@ export function testsForRpcMethodAssumingNoBlockParam(
}),
failure: error,
isRetriableFailure: true,
getExpectedError: (url: string) =>
getExpectedError: () =>
expect.objectContaining({
message: `request to ${url} failed, reason: ${error.message}`,
message: expect.stringContaining(error.message),
}),
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/notification-services-controller/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ module.exports = merge(baseConfig, {
],

// These tests rely on the Crypto API
testEnvironment: '<rootDir>/jest.environment.js',
testEnvironment: '../../tests/jest-environment-jsdom.js',
});
29 changes: 0 additions & 29 deletions packages/notification-services-controller/jest.environment.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/notification-services-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
"typedoc-plugin-missing-exports": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/phishing-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@types/jest": "^29.5.14",
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/profile-metrics-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@types/jest": "^29.5.14",
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/profile-sync-controller/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ module.exports = merge(baseConfig, {
],

// These tests rely on the Crypto API
testEnvironment: '<rootDir>/jest.environment.js',
testEnvironment: '../../tests/jest-environment-jsdom.js',
});
29 changes: 0 additions & 29 deletions packages/profile-sync-controller/jest.environment.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/profile-sync-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"ethers": "^6.12.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
"typedoc-plugin-missing-exports": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ramps-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@types/sinon": "^9.0.10",
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
Expand Down
2 changes: 1 addition & 1 deletion packages/remote-feature-flag-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@types/jest": "^29.5.14",
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
"typedoc-plugin-missing-exports": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/sample-controllers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@types/jest": "^29.5.14",
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"nock": "^13.3.1",
"nock": "^14.0.11",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
Expand Down
Loading
Loading