chore: remove history & clean up some U&P tests #16992

joshuaellis · 2023-06-12T16:54:48Z

What does it do?

refactors usePlugins hook because it would cause an infinite loop in the test env - not great lucky it didn't happen in the app 🙃
removes erroneous file structures // files // exports
removes the use of history in the test files
refactors tests to avoid looking at snapshots
refactors MSW to work across the whole u&p test FE test suite for consistency and clarity

Why is it needed?

We shouldn't / don't need to be using Router in our FE tests, we should MemoryRouter instead
Snapshots are not as helpful as actual assertions in page files!
🧽 🪣

Note

I think the pages could have had a lot more testing and there's a lot of code in the plugin in general that could be cleaned up and tested, but i'm waiting confirmation on the future of the plugin before sinking more time into it.

How to test it?

Automated testing 😎

Related issue(s)/PR(s)

resolves CONTENT-1498

github-actions · 2023-06-12T17:02:05Z

Size Change: -560 B (0%)

Total Size: 1.52 MB

Filename	Size	Change
`packages/core/admin/build/Admin_settingsPage.********.chunk.js`	9.15 kB	-129 B (-1%)
`packages/core/admin/build/admin-app.********.chunk.js`	22.3 kB	-476 B (-2%)
`packages/core/admin/build/runtime~main.********.js`	4.81 kB	+32 B (+1%)
`packages/core/admin/build/users-roles-settings-page.********.chunk.js`	7.36 kB	+10 B (0%)

ℹ️ View Unchanged

Filename	Size	Change
`packages/core/admin/build/Admin_homePage.********.chunk.js`	8.46 kB	0 B
`packages/core/admin/build/Admin_InternalErrorPage.********.chunk.js`	495 B	0 B
`packages/core/admin/build/Admin_marketplace.********.chunk.js`	8.32 kB	0 B
`packages/core/admin/build/Admin_pluginsPage.********.chunk.js`	1.17 kB	0 B
`packages/core/admin/build/Admin_profilePage.********.chunk.js`	3.42 kB	-1 B (0%)
`packages/core/admin/build/Admin-authenticatedApp.********.chunk.js`	8.27 kB	+1 B (0%)
`packages/core/admin/build/admin-edit-roles-page.********.chunk.js`	15.7 kB	-2 B (0%)
`packages/core/admin/build/admin-edit-users.********.chunk.js`	4.1 kB	0 B
`packages/core/admin/build/admin-roles-list.********.chunk.js`	3.03 kB	-1 B (0%)
`packages/core/admin/build/admin-users.********.chunk.js`	6.19 kB	0 B
`packages/core/admin/build/api-tokens-create-page.********.chunk.js`	232 B	0 B
`packages/core/admin/build/api-tokens-edit-page.********.chunk.js`	232 B	0 B
`packages/core/admin/build/api-tokens-list-page.********.chunk.js`	2.78 kB	0 B
`packages/core/admin/build/ar-json.********.chunk.js`	19.6 kB	0 B
`packages/core/admin/build/audit-logs-settings-page.********.chunk.js`	4.07 kB	0 B
`packages/core/admin/build/bb3108f7fd1e6179bde1.svg`	352 B	0 B
`packages/core/admin/build/bb4d0d527bdfb161bc5a.svg`	2.33 kB	0 B
`packages/core/admin/build/ca-json.********.chunk.js`	12.9 kB	0 B
`packages/core/admin/build/content-manager.********.chunk.js`	63.3 kB	0 B
`packages/core/admin/build/content-type-builder-list-view.********.chunk.js`	7.15 kB	0 B
`packages/core/admin/build/content-type-builder-translation-ar-json.********.chunk.js`	1.35 kB	0 B
`packages/core/admin/build/content-type-builder-translation-cs-json.********.chunk.js`	2.88 kB	0 B
`packages/core/admin/build/content-type-builder-translation-de-json.********.chunk.js`	4.19 kB	0 B
`packages/core/admin/build/content-type-builder-translation-dk-json.********.chunk.js`	3.75 kB	0 B
`packages/core/admin/build/content-type-builder-translation-en-json.********.chunk.js`	4.2 kB	0 B
`packages/core/admin/build/content-type-builder-translation-es-json.********.chunk.js`	3.97 kB	0 B
`packages/core/admin/build/content-type-builder-translation-fr-json.********.chunk.js`	1.66 kB	0 B
`packages/core/admin/build/content-type-builder-translation-id-json.********.chunk.js`	3.34 kB	0 B
`packages/core/admin/build/content-type-builder-translation-it-json.********.chunk.js`	3.47 kB	0 B
`packages/core/admin/build/content-type-builder-translation-ja-json.********.chunk.js`	1.23 kB	0 B
`packages/core/admin/build/content-type-builder-translation-ko-json.********.chunk.js`	4.37 kB	0 B
`packages/core/admin/build/content-type-builder-translation-ms-json.********.chunk.js`	3.28 kB	0 B
`packages/core/admin/build/content-type-builder-translation-nl-json.********.chunk.js`	3.3 kB	0 B
`packages/core/admin/build/content-type-builder-translation-pl-json.********.chunk.js`	4.16 kB	0 B
`packages/core/admin/build/content-type-builder-translation-pt-BR-json.********.chunk.js`	4.17 kB	0 B
`packages/core/admin/build/content-type-builder-translation-pt-json.********.chunk.js`	1.1 kB	0 B
`packages/core/admin/build/content-type-builder-translation-ru-json.********.chunk.js`	4.69 kB	0 B
`packages/core/admin/build/content-type-builder-translation-sk-json.********.chunk.js`	3.74 kB	0 B
`packages/core/admin/build/content-type-builder-translation-sv-json.********.chunk.js`	4.18 kB	0 B
`packages/core/admin/build/content-type-builder-translation-th-json.********.chunk.js`	4.36 kB	0 B
`packages/core/admin/build/content-type-builder-translation-tr-json.********.chunk.js`	3.84 kB	0 B
`packages/core/admin/build/content-type-builder-translation-uk-json.********.chunk.js`	4.37 kB	0 B
`packages/core/admin/build/content-type-builder-translation-zh-Hans-json.********.chunk.js`	3.5 kB	0 B
`packages/core/admin/build/content-type-builder-translation-zh-json.********.chunk.js`	4.5 kB	0 B
`packages/core/admin/build/content-type-builder.********.chunk.js`	27.3 kB	0 B
`packages/core/admin/build/cs-json.********.chunk.js`	5.88 kB	0 B
`packages/core/admin/build/de-json.********.chunk.js`	12.8 kB	0 B
`packages/core/admin/build/dk-json.********.chunk.js`	10.5 kB	0 B
`packages/core/admin/build/email-settings-page.********.chunk.js`	3.6 kB	0 B
`packages/core/admin/build/email-translation-ar-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-cs-json.********.chunk.js`	121 B	0 B
`packages/core/admin/build/email-translation-de-json.********.chunk.js`	120 B	0 B
`packages/core/admin/build/email-translation-dk-json.********.chunk.js`	616 B	0 B
`packages/core/admin/build/email-translation-en-json.********.chunk.js`	610 B	0 B
`packages/core/admin/build/email-translation-es-json.********.chunk.js`	675 B	0 B
`packages/core/admin/build/email-translation-fr-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-id-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-it-json.********.chunk.js`	118 B	0 B
`packages/core/admin/build/email-translation-ja-json.********.chunk.js`	787 B	0 B
`packages/core/admin/build/email-translation-ko-json.********.chunk.js`	758 B	0 B
`packages/core/admin/build/email-translation-ms-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-nl-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-pl-json.********.chunk.js`	660 B	0 B
`packages/core/admin/build/email-translation-pt-BR-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-pt-json.********.chunk.js`	668 B	0 B
`packages/core/admin/build/email-translation-ru-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-sk-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-th-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-tr-json.********.chunk.js`	687 B	0 B
`packages/core/admin/build/email-translation-uk-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-vi-json.********.chunk.js`	122 B	0 B
`packages/core/admin/build/email-translation-zh-Hans-json.********.chunk.js`	473 B	0 B
`packages/core/admin/build/email-translation-zh-json.********.chunk.js`	730 B	0 B
`packages/core/admin/build/en-json.********.chunk.js`	15.1 kB	0 B
`packages/core/admin/build/es-json.********.chunk.js`	14 kB	0 B
`packages/core/admin/build/eu-json.********.chunk.js`	14.1 kB	0 B
`packages/core/admin/build/fr-json.********.chunk.js`	12.6 kB	0 B
`packages/core/admin/build/gu-json.********.chunk.js`	14.2 kB	0 B
`packages/core/admin/build/he-json.********.chunk.js`	6.48 kB	0 B
`packages/core/admin/build/hi-json.********.chunk.js`	16.3 kB	0 B
`packages/core/admin/build/highlight.js.********.chunk.js`	842 B	0 B
`packages/core/admin/build/hu-json.********.chunk.js`	15.4 kB	0 B
`packages/core/admin/build/i18n-settings-page.********.chunk.js`	4.94 kB	0 B
`packages/core/admin/build/i18n-translation-de-json.********.chunk.js`	1.62 kB	0 B
`packages/core/admin/build/i18n-translation-dk-json.********.chunk.js`	1.62 kB	0 B
`packages/core/admin/build/i18n-translation-en-json.********.chunk.js`	1.57 kB	0 B
`packages/core/admin/build/i18n-translation-es-json.********.chunk.js`	1.68 kB	0 B
`packages/core/admin/build/i18n-translation-fr-json.********.chunk.js`	1.73 kB	0 B
`packages/core/admin/build/i18n-translation-ko-json.********.chunk.js`	1.86 kB	0 B
`packages/core/admin/build/i18n-translation-pl-json.********.chunk.js`	1.8 kB	0 B
`packages/core/admin/build/i18n-translation-ru-json.********.chunk.js`	2.3 kB	0 B
`packages/core/admin/build/i18n-translation-tr-json.********.chunk.js`	1.7 kB	0 B
`packages/core/admin/build/i18n-translation-zh-Hans-json.********.chunk.js`	1.64 kB	0 B
`packages/core/admin/build/i18n-translation-zh-json.********.chunk.js`	1.73 kB	0 B
`packages/core/admin/build/id-json.********.chunk.js`	7.46 kB	0 B
`packages/core/admin/build/index.html`	263 B	+2 B (+1%)
`packages/core/admin/build/it-json.********.chunk.js`	7.93 kB	0 B
`packages/core/admin/build/ja-json.********.chunk.js`	12.2 kB	0 B
`packages/core/admin/build/ko-json.********.chunk.js`	11.5 kB	0 B
`packages/core/admin/build/main.********.js`	587 kB	+5 B (0%)
`packages/core/admin/build/ml-json.********.chunk.js`	17.2 kB	0 B
`packages/core/admin/build/ms-json.********.chunk.js`	6.16 kB	0 B
`packages/core/admin/build/nl-json.********.chunk.js`	14.3 kB	0 B
`packages/core/admin/build/no-json.********.chunk.js`	5.48 kB	0 B
`packages/core/admin/build/pl-json.********.chunk.js`	13.1 kB	0 B
`packages/core/admin/build/pt-BR-json.********.chunk.js`	13.8 kB	0 B
`packages/core/admin/build/pt-json.********.chunk.js`	5.71 kB	0 B
`packages/core/admin/build/review-workflows-settings.********.chunk.js`	4.49 kB	0 B
`packages/core/admin/build/ru-json.********.chunk.js`	21.6 kB	0 B
`packages/core/admin/build/sa-json.********.chunk.js`	16.9 kB	0 B
`packages/core/admin/build/sk-json.********.chunk.js`	11.8 kB	0 B
`packages/core/admin/build/sso-settings-page.********.chunk.js`	1.7 kB	-1 B (0%)
`packages/core/admin/build/sv-json.********.chunk.js`	14.1 kB	0 B
`packages/core/admin/build/th-json.********.chunk.js`	9.01 kB	0 B
`packages/core/admin/build/tr-json.********.chunk.js`	13.7 kB	0 B
`packages/core/admin/build/transfer-tokens-create-page.********.chunk.js`	237 B	0 B
`packages/core/admin/build/transfer-tokens-edit-page.********.chunk.js`	236 B	0 B
`packages/core/admin/build/transfer-tokens-list-page.********.chunk.js`	2.89 kB	0 B
`packages/core/admin/build/uk-json.********.chunk.js`	7.71 kB	0 B
`packages/core/admin/build/Upload_ConfigureTheView.********.chunk.js`	1.74 kB	0 B
`packages/core/admin/build/upload-settings.********.chunk.js`	3.08 kB	0 B
`packages/core/admin/build/upload-translation-ca-json.********.chunk.js`	2.48 kB	0 B
`packages/core/admin/build/upload-translation-de-json.********.chunk.js`	2.19 kB	0 B
`packages/core/admin/build/upload-translation-dk-json.********.chunk.js`	1.96 kB	0 B
`packages/core/admin/build/upload-translation-en-json.********.chunk.js`	2.58 kB	0 B
`packages/core/admin/build/upload-translation-es-json.********.chunk.js`	2.45 kB	0 B
`packages/core/admin/build/upload-translation-fr-json.********.chunk.js`	2.86 kB	0 B
`packages/core/admin/build/upload-translation-he-json.********.chunk.js`	1.84 kB	0 B
`packages/core/admin/build/upload-translation-it-json.********.chunk.js`	1.56 kB	0 B
`packages/core/admin/build/upload-translation-ja-json.********.chunk.js`	1.92 kB	0 B
`packages/core/admin/build/upload-translation-ko-json.********.chunk.js`	2.5 kB	0 B
`packages/core/admin/build/upload-translation-ms-json.********.chunk.js`	1.41 kB	0 B
`packages/core/admin/build/upload-translation-pl-json.********.chunk.js`	2.19 kB	0 B
`packages/core/admin/build/upload-translation-pt-BR-json.********.chunk.js`	1.61 kB	0 B
`packages/core/admin/build/upload-translation-pt-json.********.chunk.js`	1.61 kB	0 B
`packages/core/admin/build/upload-translation-ru-json.********.chunk.js`	2.02 kB	0 B
`packages/core/admin/build/upload-translation-sk-json.********.chunk.js`	2.58 kB	0 B
`packages/core/admin/build/upload-translation-th-json.********.chunk.js`	1.99 kB	0 B
`packages/core/admin/build/upload-translation-tr-json.********.chunk.js`	2.35 kB	0 B
`packages/core/admin/build/upload-translation-uk-json.********.chunk.js`	1.96 kB	0 B
`packages/core/admin/build/upload-translation-zh-Hans-json.********.chunk.js`	3.12 kB	0 B
`packages/core/admin/build/upload-translation-zh-json.********.chunk.js`	2.65 kB	0 B
`packages/core/admin/build/upload.********.chunk.js`	7.62 kB	0 B
`packages/core/admin/build/users-advanced-settings-page.********.chunk.js`	3.42 kB	0 B
`packages/core/admin/build/users-email-settings-page.********.chunk.js`	3.53 kB	0 B
`packages/core/admin/build/users-permissions-translation-ar-json.********.chunk.js`	1.51 kB	0 B
`packages/core/admin/build/users-permissions-translation-cs-json.********.chunk.js`	1.46 kB	0 B
`packages/core/admin/build/users-permissions-translation-de-json.********.chunk.js`	1.58 kB	0 B
`packages/core/admin/build/users-permissions-translation-dk-json.********.chunk.js`	1.92 kB	0 B
`packages/core/admin/build/users-permissions-translation-en-json.********.chunk.js`	1.81 kB	0 B
`packages/core/admin/build/users-permissions-translation-es-json.********.chunk.js`	2.05 kB	0 B
`packages/core/admin/build/users-permissions-translation-fr-json.********.chunk.js`	1.41 kB	0 B
`packages/core/admin/build/users-permissions-translation-id-json.********.chunk.js`	1.49 kB	0 B
`packages/core/admin/build/users-permissions-translation-it-json.********.chunk.js`	1.57 kB	0 B
`packages/core/admin/build/users-permissions-translation-ja-json.********.chunk.js`	1.53 kB	0 B
`packages/core/admin/build/users-permissions-translation-ko-json.********.chunk.js`	2.23 kB	0 B
`packages/core/admin/build/users-permissions-translation-ms-json.********.chunk.js`	1.27 kB	0 B
`packages/core/admin/build/users-permissions-translation-nl-json.********.chunk.js`	1.32 kB	0 B
`packages/core/admin/build/users-permissions-translation-pl-json.********.chunk.js`	2.11 kB	0 B
`packages/core/admin/build/users-permissions-translation-pt-BR-json.********.chunk.js`	1.21 kB	0 B
`packages/core/admin/build/users-permissions-translation-pt-json.********.chunk.js`	1.3 kB	0 B
`packages/core/admin/build/users-permissions-translation-ru-json.********.chunk.js`	2.75 kB	0 B
`packages/core/admin/build/users-permissions-translation-sk-json.********.chunk.js`	1.38 kB	0 B
`packages/core/admin/build/users-permissions-translation-sv-json.********.chunk.js`	2.01 kB	0 B
`packages/core/admin/build/users-permissions-translation-th-json.********.chunk.js`	2.01 kB	0 B
`packages/core/admin/build/users-permissions-translation-tr-json.********.chunk.js`	2.07 kB	0 B
`packages/core/admin/build/users-permissions-translation-uk-json.********.chunk.js`	1.75 kB	0 B
`packages/core/admin/build/users-permissions-translation-vi-json.********.chunk.js`	1.51 kB	0 B
`packages/core/admin/build/users-permissions-translation-zh-Hans-json.********.chunk.js`	2.19 kB	0 B
`packages/core/admin/build/users-permissions-translation-zh-json.********.chunk.js`	2.1 kB	0 B
`packages/core/admin/build/users-providers-settings-page.********.chunk.js`	5.52 kB	0 B
`packages/core/admin/build/vi-json.********.chunk.js`	5.98 kB	0 B
`packages/core/admin/build/webhook-edit-page.********.chunk.js`	5.49 kB	0 B
`packages/core/admin/build/webhook-list-page.********.chunk.js`	3.11 kB	0 B
`packages/core/admin/build/zh-Hans-json.********.chunk.js`	17.2 kB	0 B
`packages/core/admin/build/zh-json.********.chunk.js`	15.1 kB	0 B
`packages/core/helper-plugin/build/helper-plugin.esm.js`	24.4 kB	0 B
`packages/core/helper-plugin/build/helper-plugin.js`	22.2 kB	0 B

_{compressed-size-action}

packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage.js

gu-stav

Very nice cleanup!

strapi-bot · 2023-06-28T22:41:51Z

This pull request has been mentioned on Strapi Community Forum. There might be relevant details there:

https://forum.strapi.io/t/new-content-type-fields-for-users-permissions-user-arent-preserved/29604/4

joshuaellis added source: plugin:users-permissions Source is plugin/users-permissions package pr: chore This PR contains chore tasks (cleanups, configs, tooling...) labels Jun 12, 2023

joshuaellis added this to the 4.11.2 milestone Jun 12, 2023

joshuaellis requested review from gu-stav, simotae14 and remidej June 12, 2023 16:54

joshuaellis self-assigned this Jun 12, 2023

joshuaellis added 3 commits June 19, 2023 08:27

chore: remove history from U&P ListView

af5b825

test: remove history and refactor to remove snapshots in U&P plugin

6ce2b01

chore: update yarn lock

707c4f0

joshuaellis force-pushed the chore/remove-history-from-tests-pt1 branch from 5ff32e8 to 707c4f0 Compare June 19, 2023 07:31

joshuaellis added 2 commits June 19, 2023 08:32

chore: fix lint

bac64bf

chore: fix fe-tests

ab88abd

gu-stav reviewed Jun 19, 2023

View reviewed changes

packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage.js Outdated Show resolved Hide resolved

chore: unify schemas

dbc3407

joshuaellis requested a review from gu-stav June 19, 2023 09:04

gu-stav approved these changes Jun 19, 2023

View reviewed changes

joshuaellis merged commit bc6034c into main Jun 19, 2023
55 checks passed

joshuaellis deleted the chore/remove-history-from-tests-pt1 branch June 19, 2023 09:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: remove history & clean up some U&P tests #16992

chore: remove history & clean up some U&P tests #16992

joshuaellis commented Jun 12, 2023

github-actions bot commented Jun 12, 2023 •

edited

gu-stav left a comment

strapi-bot commented Jun 28, 2023

chore: remove history & clean up some U&P tests #16992

chore: remove history & clean up some U&P tests #16992

Conversation

joshuaellis commented Jun 12, 2023

What does it do?

Why is it needed?

Note

How to test it?

Related issue(s)/PR(s)

github-actions bot commented Jun 12, 2023 • edited

gu-stav left a comment

Choose a reason for hiding this comment

strapi-bot commented Jun 28, 2023

github-actions bot commented Jun 12, 2023 •

edited