From fdf3f6dcfbb80e43b7bc6bb21101c2b986c9cb8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20de=20Juvigny?= Date: Thu, 17 Nov 2022 19:06:25 +0100 Subject: [PATCH] Use total count in tabs and remove getByRole --- .../admin/admin/src/pages/MarketplacePage/index.js | 4 ++-- .../tests/__snapshots__/index.test.js.snap | 4 ++-- .../tests/__snapshots__/plugins.test.js.snap | 4 ++-- .../tests/__snapshots__/providers.test.js.snap | 4 ++-- .../src/pages/MarketplacePage/tests/index.test.js | 4 ++-- .../src/pages/MarketplacePage/tests/plugins.test.js | 10 +++++----- .../src/pages/MarketplacePage/tests/providers.test.js | 10 +++++----- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/index.js index 5d0b7a22a3..a434d95a4c 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/index.js @@ -293,14 +293,14 @@ const MarketPlacePage = () => { id: 'admin.pages.MarketPlacePage.plugins', defaultMessage: 'Plugins', })}{' '} - ({pluginSearchResults.length}) + ({marketplacePluginsResponse.meta.pagination.total}) {formatMessage({ id: 'admin.pages.MarketPlacePage.providers', defaultMessage: 'Providers', })}{' '} - ({providerSearchResults.length}) + ({marketplaceProvidersResponse.meta.pagination.total}) diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap index 1f424f1f4e..cbd67eccb2 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap @@ -1111,7 +1111,7 @@ exports[`Marketplace page - layout renders the online layout 1`] = ` Plugins ( - 5 + 96 ) @@ -1134,7 +1134,7 @@ exports[`Marketplace page - layout renders the online layout 1`] = ` Providers ( - 9 + 96 ) diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap index d18427ba45..547afcc1f6 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/plugins.test.js.snap @@ -1111,7 +1111,7 @@ exports[`Marketplace page - plugins tab renders and matches the plugin tab snaps Plugins ( - 5 + 96 ) @@ -1134,7 +1134,7 @@ exports[`Marketplace page - plugins tab renders and matches the plugin tab snaps Providers ( - 9 + 96 ) diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap index c4f6d39336..24afc54a97 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/providers.test.js.snap @@ -1163,7 +1163,7 @@ exports[`Marketplace page - providers tab renders and matches the providers tab Plugins ( - 5 + 96 ) @@ -1187,7 +1187,7 @@ exports[`Marketplace page - providers tab renders and matches the providers tab Providers ( - 9 + 96 ) diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js index 32fd1367f2..1662ee981a 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js @@ -42,6 +42,8 @@ jest.mock('@strapi/helper-plugin', () => ({ })), })); +const user = userEvent.setup(); + const client = new QueryClient({ defaultOptions: { queries: { @@ -133,7 +135,6 @@ describe('Marketplace page - layout', () => { it('shows compatibility tooltip message when no version provided', async () => { client.clear(); - const user = userEvent.setup(); const { getByTestId } = render(App); await waitForReload(); @@ -186,7 +187,6 @@ describe('Marketplace page - layout', () => { it('shows only downloads count and not github stars if there are no or 0 stars and no downloads available for any package', async () => { client.clear(); - const user = userEvent.setup(); render(App); await waitForReload(); diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js index fc528f5b92..3f392c5f32 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js @@ -447,27 +447,27 @@ describe('Marketplace page - plugins tab', () => { // Should have pagination section with 4 pages const pagination = screen.getByLabelText(/pagination/i); expect(pagination).toBeVisible(); - const pageButtons = screen.getAllByRole('link', { name: /go to page \d+/i }); + const pageButtons = screen.getAllByText(/go to page \d+/i).map((el) => el.closest('a')); expect(pageButtons.length).toBe(4); // Can't go to previous page since there isn't one - expect(screen.getByRole('link', { name: /go to previous page/i })).toHaveAttribute( + expect(screen.getByText(/go to previous page/i).closest('a')).toHaveAttribute( 'aria-disabled', 'true' ); // Can go to next page - await user.click(screen.getByRole('link', { name: /go to next page/i })); + await user.click(screen.getByText(/go to next page/i).closest('a')); await waitForReload(); expect(history.location.search).toBe('?page=2'); // Can go to previous page - await user.click(screen.getByRole('link', { name: /go to previous page/i })); + await user.click(screen.getByText(/go to previous page/i).closest('a')); await waitForReload(); expect(history.location.search).toBe('?page=1'); // Can go to specific page - await user.click(screen.getByRole('link', { name: /go to page 3/i })); + await user.click(screen.getByText(/go to page 3/i).closest('a')); await waitForReload(); expect(history.location.search).toBe('?page=3'); }); diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js index 54944dae36..73ad5060d1 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js @@ -348,27 +348,27 @@ describe('Marketplace page - providers tab', () => { // Should have pagination section with 4 pages const pagination = screen.getByLabelText(/pagination/i); expect(pagination).toBeVisible(); - const pageButtons = screen.getAllByRole('link', { name: /go to page \d+/i }); + const pageButtons = screen.getAllByText(/go to page \d+/i).map((el) => el.closest('a')); expect(pageButtons.length).toBe(4); // Can't go to previous page since there isn't one - expect(screen.getByRole('link', { name: /go to previous page/i })).toHaveAttribute( + expect(screen.getByText(/go to previous page/i).closest('a')).toHaveAttribute( 'aria-disabled', 'true' ); // Can go to next page - await user.click(screen.getByRole('link', { name: /go to next page/i })); + await user.click(screen.getByText(/go to next page/i).closest('a')); await waitForReload(); expect(history.location.search).toBe('?npmPackageType=provider&sort=name:asc&page=2'); // Can go to previous page - await user.click(screen.getByRole('link', { name: /go to previous page/i })); + await user.click(screen.getByText(/go to previous page/i).closest('a')); await waitForReload(); expect(history.location.search).toBe('?npmPackageType=provider&sort=name:asc&page=1'); // Can go to specific page - await user.click(screen.getByRole('link', { name: /go to page 3/i })); + await user.click(screen.getByText(/go to page 3/i).closest('a')); await waitForReload(); expect(history.location.search).toBe('?npmPackageType=provider&sort=name:asc&page=3'); });