From 1a0b2fc6cd98ef060181454b224981569d2d969d Mon Sep 17 00:00:00 2001 From: Aki Hamano <54422211+t-hamano@users.noreply.github.com> Date: Mon, 10 Feb 2025 16:22:10 +0900 Subject: [PATCH] e2e: Fix "add new" selector (#69111) * e2e: Fix "add new" selector * Fix "Add new page" selector * Fix "Add new tag" selector * Fix "Add new template" selector * Fix "Add new template" selector * Fix "Add new pattern" selector * Fix "Add new template part" selector * Revert "Add new page" selector Co-authored-by: t-hamano Co-authored-by: Mamaduka --- .../various/block-editor-keyboard-shortcuts.spec.js | 2 +- test/e2e/specs/editor/various/inserting-blocks.spec.js | 2 +- .../e2e/specs/editor/various/pattern-overrides.spec.js | 8 ++++---- test/e2e/specs/editor/various/patterns.spec.js | 10 +++++----- test/e2e/specs/editor/various/taxonomies.spec.js | 8 ++------ test/e2e/specs/editor/various/writing-flow.spec.js | 2 +- .../specs/site-editor/block-style-variations.spec.js | 2 +- test/e2e/specs/site-editor/pages.spec.js | 4 ++-- test/e2e/specs/site-editor/patterns.spec.js | 8 ++++---- .../site-editor/site-editor-url-navigation.spec.js | 8 ++++---- .../specs/site-editor/template-registration.spec.js | 2 +- test/e2e/specs/site-editor/templates.spec.js | 2 +- 12 files changed, 27 insertions(+), 31 deletions(-) diff --git a/test/e2e/specs/editor/various/block-editor-keyboard-shortcuts.spec.js b/test/e2e/specs/editor/various/block-editor-keyboard-shortcuts.spec.js index 967baccfcbe4e..a368d4b7f0251 100644 --- a/test/e2e/specs/editor/various/block-editor-keyboard-shortcuts.spec.js +++ b/test/e2e/specs/editor/various/block-editor-keyboard-shortcuts.spec.js @@ -192,7 +192,7 @@ test.describe( 'Block editor keyboard shortcuts', () => { .getByRole( 'menuitem', { name: 'Create pattern' } ) .click(); await page - .getByRole( 'dialog', { name: 'add new pattern' } ) + .getByRole( 'dialog', { name: 'add pattern' } ) .getByRole( 'textbox', { name: 'Name' } ) .fill( 'hi' ); diff --git a/test/e2e/specs/editor/various/inserting-blocks.spec.js b/test/e2e/specs/editor/various/inserting-blocks.spec.js index 3cc369f75f223..4de9f736ceafa 100644 --- a/test/e2e/specs/editor/various/inserting-blocks.spec.js +++ b/test/e2e/specs/editor/various/inserting-blocks.spec.js @@ -269,7 +269,7 @@ test.describe( 'Inserting blocks (@firefox, @webkit)', () => { .click(); await page.getByRole( 'menuitem', { name: 'Create pattern' } ).click(); const createPatternDialog = page.getByRole( 'dialog', { - name: 'add new pattern', + name: 'add pattern', } ); await createPatternDialog .getByRole( 'textbox', { name: 'Name' } ) diff --git a/test/e2e/specs/editor/various/pattern-overrides.spec.js b/test/e2e/specs/editor/various/pattern-overrides.spec.js index 145fa9a93bab1..d3ebf35761595 100644 --- a/test/e2e/specs/editor/various/pattern-overrides.spec.js +++ b/test/e2e/specs/editor/various/pattern-overrides.spec.js @@ -40,16 +40,16 @@ test.describe( 'Pattern Overrides', () => { await page .getByRole( 'region', { name: 'Patterns content' } ) - .getByRole( 'button', { name: 'add new pattern' } ) + .getByRole( 'button', { name: 'add pattern' } ) .click(); await page - .getByRole( 'menu', { name: 'add new pattern' } ) - .getByRole( 'menuitem', { name: 'add new pattern' } ) + .getByRole( 'menu', { name: 'add pattern' } ) + .getByRole( 'menuitem', { name: 'add pattern' } ) .click(); const createPatternDialog = page.getByRole( 'dialog', { - name: 'add new pattern', + name: 'add pattern', } ); await createPatternDialog .getByRole( 'textbox', { name: 'Name' } ) diff --git a/test/e2e/specs/editor/various/patterns.spec.js b/test/e2e/specs/editor/various/patterns.spec.js index a3af79289f270..f5f73169a0f7f 100644 --- a/test/e2e/specs/editor/various/patterns.spec.js +++ b/test/e2e/specs/editor/various/patterns.spec.js @@ -37,7 +37,7 @@ test.describe( 'Unsynced pattern', () => { await page.getByRole( 'menuitem', { name: 'Create pattern' } ).click(); const createPatternDialog = page.getByRole( 'dialog', { - name: 'add new pattern', + name: 'add pattern', } ); await createPatternDialog .getByRole( 'textbox', { name: 'Name' } ) @@ -136,7 +136,7 @@ test.describe( 'Synced pattern', () => { await page.getByRole( 'menuitem', { name: 'Create pattern' } ).click(); const createPatternDialog = page.getByRole( 'dialog', { - name: 'add new pattern', + name: 'add pattern', } ); await createPatternDialog .getByRole( 'textbox', { name: 'Name' } ) @@ -376,7 +376,7 @@ test.describe( 'Synced pattern', () => { await editor.clickBlockOptionsMenuItem( 'Create pattern' ); const createPatternDialog = page.getByRole( 'dialog', { - name: 'add new pattern', + name: 'add pattern', } ); await createPatternDialog .getByRole( 'textbox', { name: 'Name' } ) @@ -426,7 +426,7 @@ test.describe( 'Synced pattern', () => { await editor.clickBlockOptionsMenuItem( 'Create pattern' ); const createPatternDialog = editor.page.getByRole( 'dialog', { - name: 'add new pattern', + name: 'add pattern', } ); await createPatternDialog .getByRole( 'textbox', { name: 'Name' } ) @@ -610,7 +610,7 @@ test.describe( 'Synced pattern', () => { await editor.clickBlockOptionsMenuItem( 'Create pattern' ); const createPatternDialog = editor.page.getByRole( 'dialog', { - name: 'add new pattern', + name: 'add pattern', } ); await createPatternDialog .getByRole( 'textbox', { name: 'Name' } ) diff --git a/test/e2e/specs/editor/various/taxonomies.spec.js b/test/e2e/specs/editor/various/taxonomies.spec.js index efd8c9c6ee7fe..3c8231facd3b7 100644 --- a/test/e2e/specs/editor/various/taxonomies.spec.js +++ b/test/e2e/specs/editor/various/taxonomies.spec.js @@ -79,9 +79,7 @@ test.describe( 'Taxonomies', () => { const tagName = 'tag-' + generateRandomNumber(); const tags = page.locator( '.components-form-token-field__token-text' ); - await page - .getByRole( 'combobox', { name: 'Add New Tag' } ) - .fill( tagName ); + await page.getByRole( 'combobox', { name: 'Add tag' } ).fill( tagName ); await page.keyboard.press( 'Enter' ); await expect( tags ).toHaveCount( 1 ); @@ -116,9 +114,7 @@ test.describe( 'Taxonomies', () => { const tagName = "tag'-" + generateRandomNumber(); const tags = page.locator( '.components-form-token-field__token-text' ); - await page - .getByRole( 'combobox', { name: 'Add New Tag' } ) - .fill( tagName ); + await page.getByRole( 'combobox', { name: 'Add tag' } ).fill( tagName ); await page.keyboard.press( 'Enter' ); await expect( tags ).toHaveCount( 1 ); diff --git a/test/e2e/specs/editor/various/writing-flow.spec.js b/test/e2e/specs/editor/various/writing-flow.spec.js index 4077d6dcc5820..da3e62e35df53 100644 --- a/test/e2e/specs/editor/various/writing-flow.spec.js +++ b/test/e2e/specs/editor/various/writing-flow.spec.js @@ -1088,7 +1088,7 @@ test.describe( 'Writing Flow (@firefox, @webkit)', () => { await editor.clickBlockOptionsMenuItem( 'Create pattern' ); const createPatternDialog = editor.page.getByRole( 'dialog', { - name: 'add new pattern', + name: 'add pattern', } ); await createPatternDialog .getByRole( 'textbox', { name: 'Name' } ) diff --git a/test/e2e/specs/site-editor/block-style-variations.spec.js b/test/e2e/specs/site-editor/block-style-variations.spec.js index 1fa8972d34d6c..1aa3c576b72c0 100644 --- a/test/e2e/specs/site-editor/block-style-variations.spec.js +++ b/test/e2e/specs/site-editor/block-style-variations.spec.js @@ -302,7 +302,7 @@ class SiteEditorBlockStyleVariations { async function draftNewPage( page ) { await page.getByRole( 'button', { name: 'Pages' } ).click(); - await page.getByRole( 'button', { name: 'Add new page' } ).click(); + await page.getByRole( 'button', { name: 'Add page' } ).click(); await page .locator( 'role=dialog[name="Draft new: page"i]' ) .locator( 'role=textbox[name="title"i]' ) diff --git a/test/e2e/specs/site-editor/pages.spec.js b/test/e2e/specs/site-editor/pages.spec.js index 54f8a64e067cb..1a8ab33b9e884 100644 --- a/test/e2e/specs/site-editor/pages.spec.js +++ b/test/e2e/specs/site-editor/pages.spec.js @@ -5,7 +5,7 @@ const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' ); async function draftNewPage( page ) { await page.getByRole( 'button', { name: 'Pages' } ).click(); - await page.getByRole( 'button', { name: 'Add new page' } ).click(); + await page.getByRole( 'button', { name: 'Add page' } ).click(); await page .locator( 'role=dialog[name="Draft new: page"i]' ) .locator( 'role=textbox[name="title"i]' ) @@ -247,7 +247,7 @@ test.describe( 'Pages', () => { // Create a custom template first. const templateName = 'demo'; await page.getByRole( 'button', { name: 'Templates' } ).click(); - await page.getByRole( 'button', { name: 'Add New Template' } ).click(); + await page.getByRole( 'button', { name: 'Add template' } ).click(); await page .getByRole( 'button', { name: 'A custom template can be manually applied to any post or page.', diff --git a/test/e2e/specs/site-editor/patterns.spec.js b/test/e2e/specs/site-editor/patterns.spec.js index 162ec15146c67..dcb5d8c413877 100644 --- a/test/e2e/specs/site-editor/patterns.spec.js +++ b/test/e2e/specs/site-editor/patterns.spec.js @@ -43,21 +43,21 @@ test.describe( 'Patterns', () => { await expect( patterns.content ).toContainText( 'No results' ); await patterns.content - .getByRole( 'button', { name: 'add new pattern' } ) + .getByRole( 'button', { name: 'add pattern' } ) .click(); const addNewMenuItem = page .getByRole( 'menu', { - name: 'add new pattern', + name: 'add pattern', } ) .getByRole( 'menuitem', { - name: 'add new pattern', + name: 'add pattern', } ); await expect( addNewMenuItem ).toBeFocused(); await addNewMenuItem.click(); const createPatternDialog = page.getByRole( 'dialog', { - name: 'add new pattern', + name: 'add pattern', } ); await createPatternDialog .getByRole( 'textbox', { name: 'Name' } ) diff --git a/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js b/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js index a0cc0af5463ae..580b106022715 100644 --- a/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js +++ b/test/e2e/specs/site-editor/site-editor-url-navigation.spec.js @@ -33,7 +33,7 @@ test.describe( 'Site editor url navigation', () => { await admin.visitSiteEditor(); await page.click( 'role=button[name="Templates"]' ); - await page.click( 'role=button[name="Add New Template"i]' ); + await page.click( 'role=button[name="Add Template"i]' ); await page .getByRole( 'button', { name: 'Single item: Post', @@ -54,10 +54,10 @@ test.describe( 'Site editor url navigation', () => { } ) => { await admin.visitSiteEditor(); await page.click( 'role=button[name="Patterns"i]' ); - await page.click( 'role=button[name="add new pattern"i]' ); + await page.click( 'role=button[name="add pattern"i]' ); await page - .getByRole( 'menu', { name: 'add new pattern' } ) - .getByRole( 'menuitem', { name: 'add new template part' } ) + .getByRole( 'menu', { name: 'add pattern' } ) + .getByRole( 'menuitem', { name: 'add template part' } ) .click(); // Fill in a name in the dialog that pops up. await page.type( 'role=dialog >> role=textbox[name="Name"i]', 'Demo' ); diff --git a/test/e2e/specs/site-editor/template-registration.spec.js b/test/e2e/specs/site-editor/template-registration.spec.js index 9856db9713038..4f35d81737ae2 100644 --- a/test/e2e/specs/site-editor/template-registration.spec.js +++ b/test/e2e/specs/site-editor/template-registration.spec.js @@ -275,7 +275,7 @@ test.describe( 'Block template registration', () => { await admin.visitSiteEditor( { postType: 'wp_template', } ); - await page.getByLabel( 'Add New Template' ).click(); + await page.getByLabel( 'Add template' ).click(); await page.getByRole( 'button', { name: 'Author Archives' } ).click(); await page .getByRole( 'button', { name: 'Author For a specific item' } ) diff --git a/test/e2e/specs/site-editor/templates.spec.js b/test/e2e/specs/site-editor/templates.spec.js index 0c43fa02fc73b..7eeb61ec05746 100644 --- a/test/e2e/specs/site-editor/templates.spec.js +++ b/test/e2e/specs/site-editor/templates.spec.js @@ -14,7 +14,7 @@ test.describe( 'Templates', () => { const templateName = 'demo'; await admin.visitSiteEditor(); await page.getByRole( 'button', { name: 'Templates' } ).click(); - await page.getByRole( 'button', { name: 'Add New Template' } ).click(); + await page.getByRole( 'button', { name: 'Add template' } ).click(); await page .getByRole( 'button', { name: 'A custom template can be manually applied to any post or page.',