Skip to content

Commit

Permalink
e2e: Fix "add new" selector (WordPress#69111)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Co-authored-by: Mamaduka <[email protected]>
  • Loading branch information
3 people authored Feb 10, 2025
1 parent 530c61a commit 1a0b2fc
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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' );

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/editor/various/inserting-blocks.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' } )
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/specs/editor/various/pattern-overrides.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' } )
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/specs/editor/various/patterns.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' } )
Expand Down Expand Up @@ -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' } )
Expand Down Expand Up @@ -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' } )
Expand Down Expand Up @@ -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' } )
Expand Down Expand Up @@ -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' } )
Expand Down
8 changes: 2 additions & 6 deletions test/e2e/specs/editor/various/taxonomies.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/editor/various/writing-flow.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' } )
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/site-editor/block-style-variations.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]' )
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/specs/site-editor/pages.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]' )
Expand Down Expand Up @@ -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.',
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/specs/site-editor/patterns.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' } )
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/specs/site-editor/site-editor-url-navigation.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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' );
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/site-editor/template-registration.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' } )
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/specs/site-editor/templates.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down

0 comments on commit 1a0b2fc

Please sign in to comment.