Skip to content

Don't merge, just testing something out #24387

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

Closed
kasperpeulen wants to merge 33 commits into from
Closed

Don't merge, just testing something out #24387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
29f8596
Create @storybook/test package
kasperpeulen Aug 17, 2023
f0d68a1
Replace expect (from jest) with @vitest/expect
kasperpeulen Aug 25, 2023
97350aa
Fix build
kasperpeulen Aug 25, 2023
daeffb5
Move testing library to test package + some improvements
kasperpeulen Sep 19, 2023
1f02904
Add testing library assertion on expect
kasperpeulen Sep 19, 2023
b406b6d
Make sure synchronous methods are always promises, even in the first run
kasperpeulen Sep 20, 2023
76c109a
Revert mistake
kasperpeulen Sep 20, 2023
d034a44
Clear spies and instrument spies by event handler name
kasperpeulen Sep 20, 2023
e6b0f0a
Show deprecation message
kasperpeulen Sep 20, 2023
9d88027
Revert making get* method's promises and make sure we instrument `not`
kasperpeulen Sep 21, 2023
ea2c3c3
fix yarn lock
yannbf Sep 21, 2023
33cbcae
Fix eslint
kasperpeulen Sep 21, 2023
6d19861
Comment out deprecation for now
kasperpeulen Sep 22, 2023
0b76716
Fix types
kasperpeulen Sep 22, 2023
da91e3d
Make getters lazy and fix workspace
kasperpeulen Sep 22, 2023
17b3a33
Fix yarn.lock
kasperpeulen Sep 22, 2023
fae8299
Fix type fest range
kasperpeulen Sep 22, 2023
2085dd4
Patch vitest to make it compatible with the jest runner
kasperpeulen Sep 22, 2023
39ed28d
Add jest types to lock
kasperpeulen Sep 22, 2023
ddd8bf1
Better patch
kasperpeulen Sep 22, 2023
27ded25
Fix lock
kasperpeulen Sep 22, 2023
d44e0bd
Fix lazy getters
kasperpeulen Sep 23, 2023
8657c59
Fix gitignore
kasperpeulen Sep 23, 2023
db9bb66
Merge branch 'next' into kasper/test-package
kasperpeulen Oct 3, 2023
a5cdd31
Fix getter
kasperpeulen Oct 3, 2023
d62d5b2
Merge remote-tracking branch 'origin/next' into kasper/test-package
kasperpeulen Oct 3, 2023
de86f5d
Always externalize @vitest deps in tsup, as they are ESM-only. But st…
kasperpeulen Oct 4, 2023
6ee27f2
Always install extra deps
kasperpeulen Oct 3, 2023
47586d9
Fix getters that use `this`
kasperpeulen Oct 4, 2023
4ae6a77
Fix deps issue
kasperpeulen Oct 4, 2023
5497868
Merge remote-tracking branch 'origin/next' into kasper/bladiebla
kasperpeulen Oct 5, 2023
6de0d49
Fix lock files
kasperpeulen Oct 5, 2023
2b9981a
Fix check script
kasperpeulen Oct 5, 2023
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
Prev Previous commit
Next Next commit
Fix build
  • Loading branch information
@kasperpeulen
kasperpeulen committed Sep 22, 2023
commit 97350aa59e0508974a5290f79b1b65f27e98fb7d
1 change: 0 additions & 1 deletion code/lib/test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
},
"devDependencies": {
"@types/chai": "^4",
"@types/testing-library__jest-dom": "^6",
"type-fest": "~2.19",
"typescript": "~4.9.3"
},
Expand Down
2 changes: 1 addition & 1 deletion code/lib/test/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const { fn } = instrument({ fn: spy.fn }, { retain: true });
export const { expect } = instrument(
{ expect: rawExpect },
{
getKeys: (obj) => {
getKeys: (obj: Record<string, unknown>) => {
const privateApi = ['assert', '__methods', '__flags'];
if (obj.constructor === chai.Assertion) {
return Object.keys(Object.getPrototypeOf(obj)).filter((it) => !privateApi.includes(it));
Expand Down
144 changes: 62 additions & 82 deletions code/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3570,12 +3570,12 @@ __metadata:
languageName: node
linkType: hard

"@jest/expect-utils@npm:^29.6.2":
version: 29.6.2
resolution: "@jest/expect-utils@npm:29.6.2"
"@jest/expect-utils@npm:^29.6.4":
version: 29.6.4
resolution: "@jest/expect-utils@npm:29.6.4"
dependencies:
jest-get-type: ^29.4.3
checksum: 9a8dd5197d7e2d7f25a697dcb26dcf1483c5a9eccd1637ebd95b6deded6dd6d7d5513ceb1295119cd979abfc78d814ed00ff118a752028adb6646231ee234086
jest-get-type: ^29.6.3
checksum: 17d87d551090f6b460fa45605c614b2ad28e257360a5b8152216fe983370f4cfb8482d2d017552c2be43be1caa0ff5594f1381be17798dcad3899e05b297fe83
languageName: node
linkType: hard

Expand Down Expand Up @@ -3670,7 +3670,7 @@ __metadata:
languageName: node
linkType: hard

"@jest/schemas@npm:^29.4.3, @jest/schemas@npm:^29.6.0, @jest/schemas@npm:^29.6.3":
"@jest/schemas@npm:^29.4.3, @jest/schemas@npm:^29.6.3":
version: 29.6.3
resolution: "@jest/schemas@npm:29.6.3"
dependencies:
Expand Down Expand Up @@ -3763,7 +3763,7 @@ __metadata:
languageName: node
linkType: hard

"@jest/types@npm:^29.6.1, @jest/types@npm:^29.6.3":
"@jest/types@npm:^29.6.3":
version: 29.6.3
resolution: "@jest/types@npm:29.6.3"
dependencies:
Expand Down Expand Up @@ -8154,7 +8154,6 @@ __metadata:
"@storybook/instrumenter": "workspace:^"
"@testing-library/jest-dom": ^6.0.0
"@types/chai": ^4
"@types/testing-library__jest-dom": ^6
"@vitest/expect": ^0.34.2
"@vitest/spy": ^0.34.1
chai: ^4.3.7
Expand Down Expand Up @@ -9815,15 +9814,6 @@ __metadata:
languageName: node
linkType: hard

"@types/testing-library__jest-dom@npm:^6":
version: 6.0.0
resolution: "@types/testing-library__jest-dom@npm:6.0.0"
dependencies:
"@testing-library/jest-dom": "*"
checksum: 824950dc82752ddb656fa7ca851bf454804332f7a7a8571231abfc3553902198c6b96de209bb3dd1f1a15ee6a269a1efa56866041f5692ee0129308772e658e0
languageName: node
linkType: hard

"@types/tmp@npm:^0.2.3":
version: 0.2.3
resolution: "@types/tmp@npm:0.2.3"
Expand Down Expand Up @@ -10180,42 +10170,33 @@ __metadata:
linkType: hard

"@vitest/expect@npm:^0.34.2":
version: 0.34.2
resolution: "@vitest/expect@npm:0.34.2"
version: 0.34.3
resolution: "@vitest/expect@npm:0.34.3"
dependencies:
"@vitest/spy": 0.34.2
"@vitest/utils": 0.34.2
"@vitest/spy": 0.34.3
"@vitest/utils": 0.34.3
chai: ^4.3.7
checksum: 80119614a826996a36f861e7b41cc41771009e1c6d1fcfa5c024d9f5aba83c2731058dc6869fef31e29631c68bec939c8373c4905c0612e860829fca616b76dc
checksum: ec70fba265b5bbd31f9c06c60e504ee0f1394df0871a5bddbe0a6b0a2436705f5e41e183fcdec3dd8864b5432b14d4f3802b896ba625ae0a44b52a9a08ddbd73
languageName: node
linkType: hard

"@vitest/spy@npm:0.34.2":
version: 0.34.2
resolution: "@vitest/spy@npm:0.34.2"
"@vitest/spy@npm:0.34.3, @vitest/spy@npm:^0.34.1":
version: 0.34.3
resolution: "@vitest/spy@npm:0.34.3"
dependencies:
tinyspy: ^2.1.1
checksum: 98fbcea189d917693321cfded1b11d80ea8f1c1f6c6332ccbacb365e68640c286ecce28b563bb0b786e807d57f9cdd62b845ecf92e88bf184b38034ee85e4c69
checksum: 8052386c56b55ebaca5ffbf5b91bb73c8c4e0e4ca1c53c922ed947703f54363689df5b4000718bbdc7c79c84e3fb4b788c42efdb8bb8592c44123bd717097f33
languageName: node
linkType: hard

"@vitest/spy@npm:^0.34.1":
version: 0.34.1
resolution: "@vitest/spy@npm:0.34.1"
dependencies:
tinyspy: ^2.1.1
checksum: ba554f34276df580613027785ab8ca02cfd31cb588b0c506341e9a4aa75e369eaaf9d991119aa11b28e4b66819e659a3dbb4afacf46b387daabad1072746358f
languageName: node
linkType: hard

"@vitest/utils@npm:0.34.2":
version: 0.34.2
resolution: "@vitest/utils@npm:0.34.2"
"@vitest/utils@npm:0.34.3":
version: 0.34.3
resolution: "@vitest/utils@npm:0.34.3"
dependencies:
diff-sequences: ^29.4.3
loupe: ^2.3.6
pretty-format: ^29.5.0
checksum: 2165cb513094e53e456e0c73d5e8f2726fb9f92768dc954bb82f89acf3f630ed8ba86f272fc01f074bcdf794f99b866f870a3a167afc40b65a9a3f4410ee8ddc
checksum: 7ca2d82c4286b963b8d8004812464c81b42d73d027b739fa5b2f2cdfb2a14e409f8ad1da6c269ba7379c74a93bb0e81485b2040a18a06a886b49c4bef1e494ab
languageName: node
linkType: hard

Expand Down Expand Up @@ -12980,8 +12961,8 @@ __metadata:
linkType: hard

"chai@npm:^4.3.7":
version: 4.3.7
resolution: "chai@npm:4.3.7"
version: 4.3.8
resolution: "chai@npm:4.3.8"
dependencies:
assertion-error: ^1.1.0
check-error: ^1.0.2
Expand All @@ -12990,7 +12971,7 @@ __metadata:
loupe: ^2.3.1
pathval: ^1.1.1
type-detect: ^4.0.5
checksum: a11c6b74ce2d5587c3db1f1e5bf32073876319d4c65ba4e574ca9b56ec93ebbc80765e1fa4af354553afbf7ed245fb54c45d69d350a7b850c4aaf9f1e01f950f
checksum: 5aa714fbbd4b3a1506f4fc9094851bf9109f184d601c1278bcd4eb98d5ee05cc75d7e84f46d072d656502c55544b38c748a1c669468d138e41e5c9d175beffc5
languageName: node
linkType: hard

Expand Down Expand Up @@ -16807,16 +16788,15 @@ __metadata:
linkType: hard

"expect@npm:^29.6.2":
version: 29.6.2
resolution: "expect@npm:29.6.2"
version: 29.6.4
resolution: "expect@npm:29.6.4"
dependencies:
"@jest/expect-utils": ^29.6.2
"@types/node": "*"
jest-get-type: ^29.4.3
jest-matcher-utils: ^29.6.2
jest-message-util: ^29.6.2
jest-util: ^29.6.2
checksum: c45d700947f23b8d5d034678733a35bdb404c3c1f26163ef692f9a05ae0b85b1918aea030ecf5efb7ffc61f5363593a57247483078187f2406736b5c9e6ceef9
"@jest/expect-utils": ^29.6.4
jest-get-type: ^29.6.3
jest-matcher-utils: ^29.6.4
jest-message-util: ^29.6.3
jest-util: ^29.6.3
checksum: d3f4ed2fcc33f743b1dd9cf25a07c2f56c9ddd7e1b327d3e74b5febfc90880a9e2ab10c56b3bf31e14d5ead69dc4cb68f718b7fbc3fae8571f8e18675ffe8080
languageName: node
linkType: hard

Expand Down Expand Up @@ -20488,15 +20468,15 @@ __metadata:
languageName: node
linkType: hard

"jest-diff@npm:^29.6.2":
version: 29.6.2
resolution: "jest-diff@npm:29.6.2"
"jest-diff@npm:^29.6.4":
version: 29.6.4
resolution: "jest-diff@npm:29.6.4"
dependencies:
chalk: ^4.0.0
diff-sequences: ^29.4.3
jest-get-type: ^29.4.3
pretty-format: ^29.6.2
checksum: 341948de9fbbf9884a93e17a6ff638112109ca640420d62a26753329fdf1d6d0b4582a2a2e894cac4120dc8fb251361d58917288e9f1b955d286b78ab1db29c3
diff-sequences: ^29.6.3
jest-get-type: ^29.6.3
pretty-format: ^29.6.3
checksum: 5f96be0f15ba8e70acfa5512ca49ba67363678e7ce222889612385a8d9dd042822fdd22a514394fe726b1f462e605bc5d7fc130bd81fa2247e7d40413975d576
languageName: node
linkType: hard

Expand Down Expand Up @@ -20576,7 +20556,7 @@ __metadata:
languageName: node
linkType: hard

"jest-get-type@npm:^29.4.3, jest-get-type@npm:^29.6.3":
"jest-get-type@npm:^29.6.3":
version: 29.6.3
resolution: "jest-get-type@npm:29.6.3"
checksum: 552e7a97a983d3c2d4e412a44eb7de0430ff773dd99f7500962c268d6dfbfa431d7d08f919c9d960530e5f7f78eb47f267ad9b318265e5092b3ff9ede0db7c2b
Expand Down Expand Up @@ -20661,15 +20641,15 @@ __metadata:
languageName: node
linkType: hard

"jest-matcher-utils@npm:^29.6.2":
version: 29.6.2
resolution: "jest-matcher-utils@npm:29.6.2"
"jest-matcher-utils@npm:^29.6.4":
version: 29.6.4
resolution: "jest-matcher-utils@npm:29.6.4"
dependencies:
chalk: ^4.0.0
jest-diff: ^29.6.2
jest-get-type: ^29.4.3
pretty-format: ^29.6.2
checksum: 3b383753b8744431a7003c00749ee1ecb16ec4f2e23c8214a95a77e27687d4b3ddd0f4afec85fa5b4ee950c69452de35dc3f07a2da41ff5914dd04bf2decf79e
jest-diff: ^29.6.4
jest-get-type: ^29.6.3
pretty-format: ^29.6.3
checksum: aa54f7075438160bd29e8c0a02d6b7e6ed1f18bab5670d161d1555e5cfa9b61e86306a260ca0304680fb1b357a944fd1d007b6519f91fc6f67d72997b1a7fdb8
languageName: node
linkType: hard

Expand All @@ -20685,20 +20665,20 @@ __metadata:
languageName: node
linkType: hard

"jest-message-util@npm:^29.6.2":
version: 29.6.2
resolution: "jest-message-util@npm:29.6.2"
"jest-message-util@npm:^29.6.3":
version: 29.6.3
resolution: "jest-message-util@npm:29.6.3"
dependencies:
"@babel/code-frame": ^7.12.13
"@jest/types": ^29.6.1
"@jest/types": ^29.6.3
"@types/stack-utils": ^2.0.0
chalk: ^4.0.0
graceful-fs: ^4.2.9
micromatch: ^4.0.4
pretty-format: ^29.6.2
pretty-format: ^29.6.3
slash: ^3.0.0
stack-utils: ^2.0.3
checksum: 4c5624ff281aa9ea09a7fca09f58b39282d3e452651d335d68834795e59c131f20d7fa174ebededa3399f1474af410c434c4dfdba57a99e3e8acf265fbb7c123
checksum: 5ae17c0aa8076bd0d4c68a036865cf156084cf7b4f69b4ffee0f49da61f7fe9eb38c6405c1f6967df031ffe14f8a31830baa1f04f1dbea52f239689cd4e5b326
languageName: node
linkType: hard

Expand Down Expand Up @@ -20939,17 +20919,17 @@ __metadata:
languageName: node
linkType: hard

"jest-util@npm:^29.6.2":
version: 29.6.2
resolution: "jest-util@npm:29.6.2"
"jest-util@npm:^29.6.3":
version: 29.6.3
resolution: "jest-util@npm:29.6.3"
dependencies:
"@jest/types": ^29.6.1
"@jest/types": ^29.6.3
"@types/node": "*"
chalk: ^4.0.0
ci-info: ^3.2.0
graceful-fs: ^4.2.9
picomatch: ^2.2.3
checksum: 2510385dc2b828c5de89d1508984ab74edf010377e8a3664549eb1da74f96e8a1badd535b3b8da286c4e2ccfa9de4f07cb501f6c91dc7b5bc5618c248b2b2f0a
checksum: 9428c07696f27aa8f230a13a35546559f9a087f3e3744f53f69a620598234c03004b808b1b4a12120cc5771a88403bf0a1e3f95a7ccd610acf03d90c36135e88
languageName: node
linkType: hard

Expand Down Expand Up @@ -26423,14 +26403,14 @@ __metadata:
languageName: node
linkType: hard

"pretty-format@npm:^29.5.0, pretty-format@npm:^29.6.2":
version: 29.6.2
resolution: "pretty-format@npm:29.6.2"
"pretty-format@npm:^29.5.0, pretty-format@npm:^29.6.3":
version: 29.6.3
resolution: "pretty-format@npm:29.6.3"
dependencies:
"@jest/schemas": ^29.6.0
"@jest/schemas": ^29.6.3
ansi-styles: ^5.0.0
react-is: ^18.0.0
checksum: fb9b404f61c48d1b9408ec93b9dbd0266c1fed36dc99c2ebaa42c1da2354f201a57862a28455ddb573e9b14e74cb8542928c0ef85955b7fd7e3e70ce42e52b32
checksum: 73c6a46acdad4cb9337add02c850769fb831d7154cdb50b1152f3970a8fbf8292188dcccd1ba597f3e34c360af71fc0b63f1db4cf155a0098ffe2812eb7a6b22
languageName: node
linkType: hard

Expand Down