Skip to content
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

SALTO-6991: update jest-extended version to one that supports custom equality testers #6880

Merged
merged 1 commit into from
Dec 3, 2024
+42 −42
Merged

SALTO-6991: update jest-extended version to one that supports custom equality testers #6880

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
2 changes: 1 addition & 1 deletion packages/core/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ module.exports = deepMerge(require('../../jest.base.config.js'), {
statements: 90,
},
},
setupFilesAfterEnv: ['jest-extended/all', '@salto-io/element-test-utils/all'],
setupFilesAfterEnv: ['@salto-io/jest-extended/all', '@salto-io/element-test-utils/all'],
})
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
},
"devDependencies": {
"@salto-io/element-test-utils": "0.4.6",
"@salto-io/jest-extended": "^4.0.3",
"@salto-io/test-utils": "0.4.6",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.14.168",
"eslint": "^9.6.0",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"prettier": "3.2.5",
"ts-jest": "^29.2.0",
"tsc-watch": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test/core/adapters/adapters.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* CERTAIN THIRD PARTY SOFTWARE MAY BE CONTAINED IN PORTIONS OF THE SOFTWARE. See NOTICE FILE AT https://github.com/salto-io/salto/blob/main/NOTICES
*/
import 'jest-extended'
import '@salto-io/jest-extended'
import {
InstanceElement,
ElemID,
Expand Down
2 changes: 1 addition & 1 deletion packages/jira-adapter/e2e_test/adapter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { collections } from '@salto-io/lowerdash'
import each from 'jest-each'
import { Credentials } from '../src/auth'
import { credsLease, realAdapter } from './adapter'
import 'jest-extended'
import '@salto-io/jest-extended'
import JiraAdapter from '../src/adapter'
import { createInstances, createModifyInstances } from './instances'
import { findInstance } from './utils'
Expand Down
2 changes: 1 addition & 1 deletion packages/jira-adapter/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ module.exports = deepMerge(require('../../jest.base.config.js'), {
statements: 95,
},
},
setupFilesAfterEnv: ['jest-extended/all', '@salto-io/element-test-utils/all'],
setupFilesAfterEnv: ['@salto-io/jest-extended/all', '@salto-io/element-test-utils/all'],
})
2 changes: 1 addition & 1 deletion packages/jira-adapter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"devDependencies": {
"@salto-io/e2e-credentials-store": "0.4.6",
"@salto-io/element-test-utils": "0.4.6",
"@salto-io/jest-extended": "^4.0.3",
"@salto-io/test-utils": "0.4.6",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.14.168",
Expand All @@ -58,7 +59,6 @@
"eslint": "^9.6.0",
"jest": "^29.7.0",
"jest-each": "^26.6.2",
"jest-extended": "^4.0.2",
"prettier": "3.2.5",
"ts-jest": "^29.2.0",
"tsc-watch": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/jira-adapter/test/filters/issue_type_schemas/issue_type_scheme_references.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* CERTAIN THIRD PARTY SOFTWARE MAY BE CONTAINED IN PORTIONS OF THE SOFTWARE. See NOTICE FILE AT https://github.com/salto-io/salto/blob/main/NOTICES
*/
import 'jest-extended'
import '@salto-io/jest-extended'
import { filterUtils } from '@salto-io/adapter-components'
import { Element, ElemID, InstanceElement, ReferenceExpression } from '@salto-io/adapter-api'
import { getFilterParams, mockClient } from '../../utils'
Expand Down
2 changes: 1 addition & 1 deletion packages/local-workspace/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ module.exports = deepMerge(require('../../jest.base.config.js'), {
statements: 94.9,
},
},
setupFilesAfterEnv: ['jest-extended/all', '@salto-io/element-test-utils/all'],
setupFilesAfterEnv: ['@salto-io/jest-extended/all', '@salto-io/element-test-utils/all'],
})
2 changes: 1 addition & 1 deletion packages/local-workspace/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"devDependencies": {
"@aws-sdk/util-stream-node": "3.198.0",
"@salto-io/element-test-utils": "0.4.6",
"@salto-io/jest-extended": "^4.0.3",
"@salto-io/test-utils": "0.4.6",
"@types/async-lock": "^1.1.2",
"@types/fs-extra": "^9.0.8",
Expand All @@ -70,7 +71,6 @@
"aws-sdk-client-mock": "^0.5.5",
"eslint": "^9.6.0",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"nock": "^12.0.1",
"prettier": "3.2.5",
"ts-jest": "^29.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/local-workspace/test/state/content_providers/s3_content_provider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
import _ from 'lodash'
import path from 'path'
import 'jest-extended'
import '@salto-io/jest-extended'
import { Readable } from 'stream'
import getStream from 'get-stream'
import { collections } from '@salto-io/lowerdash'
Expand Down
2 changes: 1 addition & 1 deletion packages/okta-adapter/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = deepMerge(require('../../jest.base.config.js'), {
statements: 92,
},
},
setupFilesAfterEnv: ['jest-extended/all', '@salto-io/element-test-utils/all'],
setupFilesAfterEnv: ['@salto-io/jest-extended/all', '@salto-io/element-test-utils/all'],
moduleNameMapper: {
// Force CommonJS build for http adapter to be available.
// via https://github.com/axios/axios/issues/5101#issuecomment-1276572468
Expand Down
2 changes: 1 addition & 1 deletion packages/okta-adapter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"devDependencies": {
"@salto-io/e2e-credentials-store": "0.4.6",
"@salto-io/element-test-utils": "0.4.6",
"@salto-io/jest-extended": "^4.0.3",
"@salto-io/test-utils": "0.4.6",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.14.168",
Expand All @@ -53,7 +54,6 @@
"axios-mock-adapter": "^1.19.0",
"eslint": "^9.6.0",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"nock": "^12.0.1",
"prettier": "3.2.5",
"ts-jest": "^29.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforce-adapter/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ module.exports = deepMerge(require('../../jest.base.config.js'), {
statements: 95,
},
},
setupFilesAfterEnv: ['jest-extended/all', '@salto-io/element-test-utils/all'],
setupFilesAfterEnv: ['@salto-io/jest-extended/all', '@salto-io/element-test-utils/all'],
})
2 changes: 1 addition & 1 deletion packages/salesforce-adapter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"devDependencies": {
"@salto-io/e2e-credentials-store": "0.4.6",
"@salto-io/element-test-utils": "0.4.6",
"@salto-io/jest-extended": "^4.0.3",
"@salto-io/jsforce-types": "^0.1.0",
"@salto-io/test-utils": "0.4.6",
"@types/jest": "^29.5.12",
Expand All @@ -64,7 +65,6 @@
"@types/requestretry": "^1.12.8",
"eslint": "^9.6.0",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"nock": "^12.0.1",
"prettier": "3.2.5",
"request": "^2.88.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforce-adapter/test/filters/custom_type_split.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* CERTAIN THIRD PARTY SOFTWARE MAY BE CONTAINED IN PORTIONS OF THE SOFTWARE. See NOTICE FILE AT https://github.com/salto-io/salto/blob/main/NOTICES
*/
import 'jest-extended'
import '@salto-io/jest-extended'
import _ from 'lodash'
import { values } from '@salto-io/lowerdash'
import { BuiltinTypes, Element, ElemID, ObjectType } from '@salto-io/adapter-api'
Expand Down
2 changes: 1 addition & 1 deletion packages/stripe-adapter/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ module.exports = deepMerge(require('../../jest.base.config.js'), {
statements: 99,
},
},
setupFilesAfterEnv: ['jest-extended/all', '@salto-io/element-test-utils/all'],
setupFilesAfterEnv: ['@salto-io/jest-extended/all', '@salto-io/element-test-utils/all'],
})
2 changes: 1 addition & 1 deletion packages/stripe-adapter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
},
"devDependencies": {
"@salto-io/element-test-utils": "0.4.6",
"@salto-io/jest-extended": "^4.0.3",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.14.168",
"axios": "^1.7.2",
"axios-mock-adapter": "^1.19.0",
"eslint": "^9.6.0",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"prettier": "3.2.5",
"ts-jest": "^29.2.0",
"tsc-watch": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/workspace/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ module.exports = deepMerge(require('../../jest.base.config.js'), {
statements: 90,
},
},
setupFilesAfterEnv: ['jest-extended/all', '@salto-io/element-test-utils/all'],
setupFilesAfterEnv: ['@salto-io/jest-extended/all', '@salto-io/element-test-utils/all'],
})
2 changes: 1 addition & 1 deletion packages/workspace/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
"devDependencies": {
"@salto-io/dag": "0.4.6",
"@salto-io/element-test-utils": "0.4.6",
"@salto-io/jest-extended": "^4.0.3",
"@salto-io/test-utils": "0.4.6",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.14.168",
"@types/wu": "^2.1.40",
"eslint": "^9.6.0",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"prettier": "3.2.5",
"ts-jest": "^29.2.0",
"tsc-watch": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/workspace/test/workspace/workspace.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* CERTAIN THIRD PARTY SOFTWARE MAY BE CONTAINED IN PORTIONS OF THE SOFTWARE. See NOTICE FILE AT https://github.com/salto-io/salto/blob/main/NOTICES
*/
import 'jest-extended'
import '@salto-io/jest-extended'
import _ from 'lodash'
import wu from 'wu'
import {
Expand Down
44 changes: 22 additions & 22 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4131,6 +4131,7 @@ __metadata:
"@salto-io/google-workspace-adapter": 0.4.6
"@salto-io/intercom-adapter": 0.4.6
"@salto-io/jamf-adapter": 0.4.6
"@salto-io/jest-extended": ^4.0.3
"@salto-io/jira-adapter": 0.4.6
"@salto-io/local-workspace": 0.4.6
"@salto-io/logging": 0.4.6
Expand All @@ -4155,7 +4156,6 @@ __metadata:
eslint: ^9.6.0
istextorbinary: ^6.0.0
jest: ^29.7.0
jest-extended: ^4.0.2
lodash: ^4.17.21
pietile-eventemitter: ^1.0.0
prettier: 3.2.5
Expand Down Expand Up @@ -4367,6 +4367,21 @@ __metadata:
languageName: unknown
linkType: soft

"@salto-io/jest-extended@npm:^4.0.3":
version: 4.0.3
resolution: "@salto-io/jest-extended@npm:4.0.3"
dependencies:
jest-diff: ^29.0.0
jest-get-type: ^29.0.0
peerDependencies:
jest: ">=27.2.5"
peerDependenciesMeta:
jest:
optional: true
checksum: c905866ae492c3469a6ddfb65bd18dc063561cd06c68a54214deb54e4ccb61b13f1112efe051fb6f3e1ebdea276b14852038cf479e7d311fdfbb8a0ab7634d12
languageName: node
linkType: hard

"@salto-io/[email protected], @salto-io/jira-adapter@workspace:packages/jira-adapter":
version: 0.0.0-use.local
resolution: "@salto-io/jira-adapter@workspace:packages/jira-adapter"
Expand All @@ -4378,6 +4393,7 @@ __metadata:
"@salto-io/dag": 0.4.6
"@salto-io/e2e-credentials-store": 0.4.6
"@salto-io/element-test-utils": 0.4.6
"@salto-io/jest-extended": ^4.0.3
"@salto-io/logging": 0.4.6
"@salto-io/lowerdash": 0.4.6
"@salto-io/test-utils": 0.4.6
Expand All @@ -4391,7 +4407,6 @@ __metadata:
eslint: ^9.6.0
jest: ^29.7.0
jest-each: ^26.6.2
jest-extended: ^4.0.2
joi: ^17.4.0
lodash: ^4.17.21
node-html-parser: ^6.1.5
Expand Down Expand Up @@ -4476,6 +4491,7 @@ __metadata:
"@salto-io/aws-utils": 0.4.6
"@salto-io/element-test-utils": 0.4.6
"@salto-io/file": 0.4.6
"@salto-io/jest-extended": ^4.0.3
"@salto-io/logging": 0.4.6
"@salto-io/lowerdash": 0.4.6
"@salto-io/parser": 0.4.6
Expand All @@ -4500,7 +4516,6 @@ __metadata:
get-stream: ^6.0.1
glob: ^7.1.6
jest: ^29.7.0
jest-extended: ^4.0.2
joi: ^17.4.0
lodash: ^4.17.21
lru-cache: ^6.0.0
Expand Down Expand Up @@ -4719,6 +4734,7 @@ __metadata:
"@salto-io/adapter-utils": 0.4.6
"@salto-io/e2e-credentials-store": 0.4.6
"@salto-io/element-test-utils": 0.4.6
"@salto-io/jest-extended": ^4.0.3
"@salto-io/logging": 0.4.6
"@salto-io/lowerdash": 0.4.6
"@salto-io/test-utils": 0.4.6
Expand All @@ -4731,7 +4747,6 @@ __metadata:
eslint: ^9.6.0
form-data: ^4.0.0
jest: ^29.7.0
jest-extended: ^4.0.2
joi: ^17.4.0
lodash: ^4.17.21
nock: ^12.0.1
Expand Down Expand Up @@ -4845,6 +4860,7 @@ __metadata:
"@salto-io/e2e-credentials-store": 0.4.6
"@salto-io/element-test-utils": 0.4.6
"@salto-io/file": 0.4.6
"@salto-io/jest-extended": ^4.0.3
"@salto-io/jsforce": ^1.9.4
"@salto-io/jsforce-types": ^0.1.0
"@salto-io/logging": 0.4.6
Expand All @@ -4861,7 +4877,6 @@ __metadata:
fast-xml-parser: ^4.4.0
humanize-duration: ^3.22.0
jest: ^29.7.0
jest-extended: ^4.0.2
joi: ^17.4.0
jszip: ^3.10.1
lodash: ^4.17.21
Expand Down Expand Up @@ -4945,14 +4960,14 @@ __metadata:
"@salto-io/adapter-components": 0.4.6
"@salto-io/adapter-utils": 0.4.6
"@salto-io/element-test-utils": 0.4.6
"@salto-io/jest-extended": ^4.0.3
"@salto-io/logging": 0.4.6
"@types/jest": ^29.5.12
"@types/lodash": ^4.14.168
axios: ^1.7.2
axios-mock-adapter: ^1.19.0
eslint: ^9.6.0
jest: ^29.7.0
jest-extended: ^4.0.2
lodash: ^4.17.21
prettier: 3.2.5
ts-jest: ^29.2.0
Expand Down Expand Up @@ -5030,6 +5045,7 @@ __metadata:
"@salto-io/adapter-utils": 0.4.6
"@salto-io/dag": 0.4.6
"@salto-io/element-test-utils": 0.4.6
"@salto-io/jest-extended": ^4.0.3
"@salto-io/logging": 0.4.6
"@salto-io/lowerdash": 0.4.6
"@salto-io/parser": 0.4.6
Expand All @@ -5040,7 +5056,6 @@ __metadata:
async-lock: ^1.2.4
eslint: ^9.6.0
jest: ^29.7.0
jest-extended: ^4.0.2
lodash: ^4.17.21
prettier: 3.2.5
ts-jest: ^29.2.0
Expand Down Expand Up @@ -13089,21 +13104,6 @@ __metadata:
languageName: node
linkType: hard

"jest-extended@npm:^4.0.2":
version: 4.0.2
resolution: "jest-extended@npm:4.0.2"
dependencies:
jest-diff: ^29.0.0
jest-get-type: ^29.0.0
peerDependencies:
jest: ">=27.2.5"
peerDependenciesMeta:
jest:
optional: true
checksum: afdc255eec7caa173f9e805e94562273d8b8aa4c7ab9b396668f018c18ea5236270a6ac499ca84b8c60e90ccbe9ccb4aebf998daef13aec9542c426df1df6079
languageName: node
linkType: hard

"jest-get-type@npm:^26.3.0":
version: 26.3.0
resolution: "jest-get-type@npm:26.3.0"
Expand Down