diff --git a/assets/src/blocks/ActionsList/index.js b/assets/src/blocks/ActionsList/index.js index 1192ee8c30..66a75a28c3 100644 --- a/assets/src/blocks/ActionsList/index.js +++ b/assets/src/blocks/ActionsList/index.js @@ -20,7 +20,7 @@ export const registerActionsListBlock = () => { description: __('Integrate images and text cards to automatically display tags, take action pages, or Posts in a three or four column layout displayed in a grid or carousel.', 'planet4-blocks-backend'), icon: 'list-view', scope: ['inserter'], - allowedControls: ['taxQuery'], + allowedControls: ['taxQuery', 'pages', 'offset'], category: 'planet4-blocks-beta', isActive: ({namespace, query}) => namespace === ACTIONS_LIST_BLOCK_NAME && query.postType === queryPostType, attributes: { diff --git a/assets/src/blocks/PostsList/index.js b/assets/src/blocks/PostsList/index.js index 0534502711..34ad9ebbec 100644 --- a/assets/src/blocks/PostsList/index.js +++ b/assets/src/blocks/PostsList/index.js @@ -24,7 +24,7 @@ export const registerPostsListBlock = () => { description: __('Insert a list or grid of the latest articles, press releases, and/or publications, organized by publication date. ', 'planet4-blocks-backend'), category: 'planet4-blocks-beta', scope: ['inserter'], - allowedControls: ['taxQuery'], + allowedControls: ['taxQuery', 'pages', 'offset'], isActive: ({namespace, query}) => namespace === POSTS_LIST_BLOCK_NAME && query.postType === 'post', attributes: { namespace: POSTS_LIST_BLOCK_NAME, diff --git a/assets/src/editorIndex.js b/assets/src/editorIndex.js index 4b10ab818e..728bc7a7c7 100644 --- a/assets/src/editorIndex.js +++ b/assets/src/editorIndex.js @@ -14,9 +14,6 @@ import {registerBlockVariations} from './block-variations'; import {registerActionButtonTextBlock} from './blocks/ActionCustomButtonText'; wp.domReady(() => { - // Make sure to unregister the posts-list native variation before registering planet4-blocks/posts-list - wp.blocks.unregisterBlockVariation('core/query', 'posts-list'); - // Blocks registerTableOfContentsBlock(); registerColumnsBlock(); diff --git a/tests/e2e/navigation-bar.spec.js b/tests/e2e/navigation-bar.spec.js index b0e0936b48..14e03ff18b 100644 --- a/tests/e2e/navigation-bar.spec.js +++ b/tests/e2e/navigation-bar.spec.js @@ -7,7 +7,7 @@ test('Test navigation bar menu', async ({page, admin, requestUtils}) => { const testPageTitle = `Navbar test ${testId}`; // Create a new page with a dummy paragraph - await requestUtils.rest({ + const newPage = await requestUtils.rest({ path: '/wp/v2/pages', method: 'POST', data: { @@ -30,14 +30,12 @@ test('Test navigation bar menu', async ({page, admin, requestUtils}) => { const pageOptions = page.locator('#add-post-type-page'); await pageOptions.getByRole('checkbox', {name: testPageTitle}).first().check(); await pageOptions.getByRole('button', {name: 'Add to Menu'}).click(); - const newMenuItem = page.locator('.menu-item-depth-0', {hasText: testPageTitle}); - await expect(newMenuItem).toBeVisible(); - const newMenuItemLink = await newMenuItem.locator('.link-to-original a').getAttribute('href'); + await page.locator('#menu-to-edit .menu-item-title').filter({hasText: testPageTitle}).waitFor(); await page.getByRole('button', {name: 'Save Menu'}).click(); await expect(page.locator('.updated.notice')).toBeVisible(); // Check in the frontend that the new menu item is correctly added await page.goto('./'); await expect(page.getByRole('link', {name: testPageTitle})).toBeVisible(); - await expect(page.getByRole('link', {name: testPageTitle})).toHaveAttribute('href', newMenuItemLink); + await expect(page.getByRole('link', {name: testPageTitle})).toHaveAttribute('href', newPage.link); }); diff --git a/tests/e2e/tools/lib/post.js b/tests/e2e/tools/lib/post.js index 5222dc8b18..8ebc18a83a 100644 --- a/tests/e2e/tools/lib/post.js +++ b/tests/e2e/tools/lib/post.js @@ -9,6 +9,11 @@ import {expect} from './test-utils'; * @return {Promise} The URL of the published post. */ async function publishPost({page, editor}) { + // We should be able to remove this check once we update Playwright to the latest version. + const closeSettingsSidebar = await page.getByRole('button', {name: 'Close Settings'}); + if (await closeSettingsSidebar.isVisible()) { + await closeSettingsSidebar.click(); + } await editor.publishPost(); const urlString = await page