22852 Commits

Author SHA1 Message Date
Ben Irvin
56c22e33f3 fix tests 2022-08-01 13:12:10 +02:00
Ben Irvin
295133bb33 finish condition tests 2022-08-01 12:28:04 +02:00
Ben Irvin
58156444e3 expect ability.rules 2022-08-01 11:46:13 +02:00
Ben Irvin
59b34420d7 cleanup 2022-08-01 10:22:32 +02:00
Ben Irvin
b3133075e9 fix before* hooks test 2022-08-01 09:44:42 +02:00
Ben Irvin
51f8210a73 re-enable condition tests 2022-08-01 09:06:23 +02:00
Ben Irvin
7d4a106f99 fix registerFunction 2022-07-31 17:56:35 +02:00
Ben Irvin
673d471b30 start testing with mocks 2022-07-31 17:27:57 +02:00
Ben Irvin
1aec4fa0b7 allow createRegisterFunction to be wrapped 2022-07-31 17:15:36 +02:00
Ben Irvin
46ea867a27 fix conditions test 2022-07-29 12:22:22 +02:00
Ben Irvin
526d2e9025 fix tests 2022-07-29 09:42:26 +02:00
Ben Irvin
04c9514ab7 test validate hook timing 2022-07-29 09:27:18 +02:00
Ben Irvin
525e535fdf test format.permission 2022-07-29 09:19:06 +02:00
Ben Irvin
de5c1a7f57 add todo tests 2022-07-28 19:40:43 +02:00
Ben Irvin
17036e964c test hooks 2022-07-28 19:15:40 +02:00
Ben Irvin
a59821a242 Merge branch 'api-token-v2/engine-abstraction' into api-token-v2/engine-abstraction-tests 2022-07-28 18:38:14 +02:00
Ben Irvin
f4a594e9c9 add tests 2022-07-28 18:33:02 +02:00
Ben Irvin
a8cfa42a70 add more examples 2022-07-28 17:51:03 +02:00
Ben Irvin
078fb244a8 add helper functions 2022-07-28 17:50:44 +02:00
Convly
43e360a641 Fix format permission handler argument 2022-07-28 17:05:29 +02:00
Ben Irvin
8ec0977584 add initial tests 2022-07-28 13:16:14 +02:00
Convly
80713eddff Merge branch 'api-token-v2/engine-abstraction' of github.com:strapi/strapi into api-token-v2/engine-abstraction 2022-07-28 11:57:52 +02:00
Convly
1453bc0d67 Fix light typings issues 2022-07-28 11:57:40 +02:00
Jean-Sébastien Herbaux
18301960d3
Update packages/core/permissions/README.md
Co-authored-by: Ben Irvin <ben@innerdvations.com>
2022-07-28 11:37:03 +02:00
Convly
0eaa5d2915 Merge branch 'features/api-token-v2' into api-token-v2/engine-abstraction 2022-07-28 11:36:23 +02:00
Convly
0a1cc38e06 Merge branch 'master' into api-token-v2/engine-abstraction 2022-07-28 11:36:01 +02:00
Convly
5291691d47 Merge branch 'master' into features/api-token-v2 2022-07-28 11:35:51 +02:00
Pierre Noël
06694ec71d
Merge pull request #13871 from strapi/fix/ML-bulk-delete-without-a-folder-selected
Fix the bulk delete of files in the Media Library
2022-07-28 10:37:00 +02:00
Pierre Noël
1f7e485278 add e2e to bulk-delete only files and only folders 2022-07-27 18:02:47 +02:00
Pierre Noël
faa4fbaaff Fix the bulk delete in the ML when no folders are selected 2022-07-27 17:52:33 +02:00
Bassel Kanso
9692c6fa8f Merge branch 'master' into features/api-token-v2 2022-07-27 17:01:11 +03:00
Convly
3fa282be30 Merge branch 'master' into api-token-v2/engine-abstraction 2022-07-27 15:46:54 +02:00
Convly
b34d634c19 Fix format context creation 2022-07-27 15:41:24 +02:00
Convly
74a2b908df v4.3.0 v4.3.0 2022-07-27 14:44:39 +02:00
Gustav Hansen
46fdad0de1
Merge pull request #13499 from strapi/features/ML-folder
Media Library: Enable asset organization through folders
2022-07-27 14:32:44 +02:00
Gustav Hansen
608c4e642f
Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 14:32:34 +02:00
Convly
b18253f8ce Merge branch 'master' into releases/4.3.0 2022-07-27 14:27:13 +02:00
Gustav Hansen
887e7b8f7c ML: Add useTracking mocks in tests 2022-07-27 14:11:22 +02:00
Jean-Sébastien Herbaux
6b447a7b67
Merge pull request #13197 from finnsnape/fix/deprecated-uuid
Fix deprecated UUID
2022-07-27 14:10:35 +02:00
Gustav Hansen
39eb8abeea chore: Downgrade react-intl back to 5.20.2 2022-07-27 13:58:15 +02:00
Gustav Hansen
8f32d44b3a
Merge pull request #13862 from strapi/fix/tests-jest-26-compatible
Upload: Make metrics tests compatible with jest@26
2022-07-27 13:32:41 +02:00
Gustav Hansen
d886f503ca Jest: add closeTo() utility temporarily 2022-07-27 13:14:49 +02:00
Gustav Hansen
8907153d5c Merge branch 'features/ML-folder' into fix/tests-jest-26-compatible 2022-07-27 12:58:08 +02:00
Gustav Hansen
7e3c08ba3e Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 12:57:38 +02:00
Convly
ba91f47f04 Merge branch 'master' into releases/4.3.0 2022-07-27 12:55:48 +02:00
Jean-Sébastien Herbaux
c1366d400b
Merge pull request #13861 from strapi/fix/rollback-jest-26
Chore: Rollback to jest@26.x
2022-07-27 12:53:02 +02:00
Gustav Hansen
5ca0538651 Upload: Make metrics tests compatible with jest@26 2022-07-27 12:34:27 +02:00
Gustav Hansen
c77a54f735 Chore: Rollback jest-watch-typeahead to 0.6.5 2022-07-27 12:28:50 +02:00
Gustav Hansen
13d9650ce2 Chore: Rollback to jest@26.x 2022-07-27 12:21:08 +02:00
Convly
2d6afbf044 Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 10:32:43 +02:00