+
`,
@@ -434,14 +434,14 @@ test.describe( 'Pattern Overrides', () => {
const headingName = 'Editable heading';
const innerPattern = await requestUtils.createBlock( {
title: 'Inner Pattern',
- content: `
+ content: `
Inner paragraph
`,
status: 'publish',
} );
const outerPattern = await requestUtils.createBlock( {
title: 'Outer Pattern',
- content: `
+ content: `
Outer heading
`,
@@ -535,10 +535,10 @@ test.describe( 'Pattern Overrides', () => {
const paragraphName = 'Editable paragraph';
const { id } = await requestUtils.createBlock( {
title: 'Pattern',
- content: `
+ content: `
Heading
-
+
Paragraph
`,
status: 'publish',
@@ -694,7 +694,7 @@ test.describe( 'Pattern Overrides', () => {
);
const { id } = await requestUtils.createBlock( {
title: 'Pattern',
- content: `
+ content: `
![]()
`,
status: 'publish',
@@ -878,4 +878,82 @@ test.describe( 'Pattern Overrides', () => {
editorSettings.getByRole( 'button', { name: 'Enable overrides' } )
).toBeHidden();
} );
+
+ // @see https://github.com/WordPress/gutenberg/pull/60694
+ test( 'handles back-compat from individual attributes to __default', async ( {
+ page,
+ admin,
+ requestUtils,
+ editor,
+ } ) => {
+ const imageName = 'Editable image';
+ const TEST_IMAGE_FILE_PATH = path.resolve(
+ __dirname,
+ '../../../assets/10x10_e2e_test_image_z9T8jK.png'
+ );
+ const { id } = await requestUtils.createBlock( {
+ title: 'Pattern',
+ content: `
+
![]()
+`,
+ status: 'publish',
+ } );
+
+ await admin.createNewPost();
+
+ await editor.insertBlock( {
+ name: 'core/block',
+ attributes: { ref: id },
+ } );
+
+ const blocks = await editor.getBlocks( { full: true } );
+ expect( blocks ).toMatchObject( [
+ {
+ name: 'core/block',
+ attributes: { ref: id },
+ },
+ ] );
+ expect(
+ await editor.getBlocks( { clientId: blocks[ 0 ].clientId } )
+ ).toMatchObject( [
+ {
+ name: 'core/image',
+ attributes: {
+ metadata: {
+ name: imageName,
+ bindings: {
+ __default: {
+ source: 'core/pattern-overrides',
+ },
+ },
+ },
+ },
+ },
+ ] );
+
+ const imageBlock = editor.canvas.getByRole( 'document', {
+ name: 'Block: Image',
+ } );
+ await editor.selectBlocks( imageBlock );
+ await imageBlock
+ .getByTestId( 'form-file-upload-input' )
+ .setInputFiles( TEST_IMAGE_FILE_PATH );
+ await expect( imageBlock.getByRole( 'img' ) ).toHaveCount( 1 );
+ await expect( imageBlock.getByRole( 'img' ) ).toHaveAttribute(
+ 'src',
+ /\/wp-content\/uploads\//
+ );
+ await editor.showBlockToolbar();
+ await editor.clickBlockToolbarButton( 'Alt' );
+ await page
+ .getByRole( 'textbox', { name: 'alternative text' } )
+ .fill( 'Test Image' );
+
+ const postId = await editor.publishPost();
+
+ await page.goto( `/?p=${ postId }` );
+ await expect(
+ page.getByRole( 'img', { name: 'Test Image' } )
+ ).toHaveAttribute( 'src', /\/wp-content\/uploads\// );
+ } );
} );
diff --git a/test/e2e/specs/editor/various/patterns.spec.js b/test/e2e/specs/editor/various/patterns.spec.js
index 77f97ee3004a9e..781d4657a20b90 100644
--- a/test/e2e/specs/editor/various/patterns.spec.js
+++ b/test/e2e/specs/editor/various/patterns.spec.js
@@ -388,6 +388,13 @@ test.describe( 'Synced pattern', () => {
.getByRole( 'button', { name: 'Add' } )
.click();
+ // Wait until the pattern is created.
+ await expect(
+ editor.canvas.getByRole( 'document', {
+ name: 'Block: Pattern',
+ } )
+ ).toBeVisible();
+
await admin.createNewPost();
await editor.canvas
.getByRole( 'button', { name: 'Add default block' } )
@@ -432,11 +439,11 @@ test.describe( 'Synced pattern', () => {
.click();
// Wait until the pattern is created.
- await editor.canvas
- .getByRole( 'document', {
+ await expect(
+ editor.canvas.getByRole( 'document', {
name: 'Block: Pattern',
} )
- .waitFor();
+ ).toBeVisible();
// Check that only the pattern block is present.
const existingBlocks = await editor.getBlocks();
diff --git a/test/e2e/specs/editor/various/publish-panel.spec.js b/test/e2e/specs/editor/various/publish-panel.spec.js
index 534fea5289c9e1..c70a7b85cd70fe 100644
--- a/test/e2e/specs/editor/various/publish-panel.spec.js
+++ b/test/e2e/specs/editor/various/publish-panel.spec.js
@@ -113,4 +113,98 @@ test.describe( 'Post publish panel', () => {
} )
).toBeFocused();
} );
+
+ test( 'should show panel and indicator when metadata has been modified', async ( {
+ admin,
+ editor,
+ page,
+ } ) => {
+ await admin.createNewPost( {
+ title: 'Test metadata changes with save panel',
+ } );
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ content: 'paragraph default content',
+ metadata: {
+ bindings: {
+ content: {
+ source: 'core/post-meta',
+ args: { key: 'text_custom_field' },
+ },
+ },
+ },
+ },
+ } );
+ const postId = await editor.publishPost();
+ const metadataUtils = new MetadataUtils( page );
+ await metadataUtils.modifyPostMetadata(
+ 'post',
+ postId,
+ 'text_custom_field',
+ 'test value'
+ );
+ const editorTopBar = page.getByRole( 'region', {
+ name: 'Editor top bar',
+ } );
+
+ const saveButton = editorTopBar.getByRole( 'button', {
+ name: 'Save',
+ exact: true,
+ } );
+
+ await expect( saveButton ).toBeVisible();
+
+ await saveButton.click();
+
+ const publishPanel = page.getByRole( 'region', {
+ name: 'Editor publish',
+ } );
+
+ await expect( publishPanel ).toBeVisible();
+
+ const postMetaPanel = publishPanel.locator(
+ '.entities-saved-states__post-meta'
+ );
+
+ await expect( postMetaPanel ).toBeVisible();
+ } );
} );
+
+/**
+ * Utilities for working with metadata.
+ *
+ * @param postType
+ * @param postId
+ * @param metaKey
+ * @param metaValue
+ */
+class MetadataUtils {
+ constructor( page ) {
+ this.page = page;
+ }
+
+ async modifyPostMetadata( postType, postId, metaKey, metaValue ) {
+ const parameters = {
+ postType,
+ postId,
+ metaKey,
+ metaValue,
+ };
+
+ await this.page.evaluate( ( _parameters ) => {
+ window.wp.data
+ .dispatch( 'core' )
+ .editEntityRecord(
+ 'postType',
+ _parameters.postType,
+ _parameters.postId,
+ {
+ meta: {
+ [ _parameters.metaKey ]: _parameters.metaValue,
+ },
+ }
+ );
+ }, parameters );
+ }
+}
diff --git a/test/e2e/specs/editor/various/writing-flow.spec.js b/test/e2e/specs/editor/various/writing-flow.spec.js
index 2dee26255c103b..2eee3cad2b73ff 100644
--- a/test/e2e/specs/editor/various/writing-flow.spec.js
+++ b/test/e2e/specs/editor/various/writing-flow.spec.js
@@ -595,6 +595,37 @@ test.describe( 'Writing Flow (@firefox, @webkit)', () => {
] );
} );
+ test( 'should remove first empty paragraph on Backspace', async ( {
+ editor,
+ page,
+ } ) => {
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.press( 'Enter' );
+ await page.keyboard.type( '2' );
+ await page.keyboard.press( 'ArrowUp' );
+
+ // Ensure setup is correct.
+ expect( await editor.getBlocks() ).toMatchObject( [
+ {
+ name: 'core/paragraph',
+ attributes: { content: '' },
+ },
+ {
+ name: 'core/paragraph',
+ attributes: { content: '2' },
+ },
+ ] );
+
+ await page.keyboard.press( 'Backspace' );
+
+ expect( await editor.getBlocks() ).toMatchObject( [
+ {
+ name: 'core/paragraph',
+ attributes: { content: '2' },
+ },
+ ] );
+ } );
+
test( 'should merge paragraphs', async ( { editor, page } ) => {
await page.keyboard.press( 'Enter' );
await page.keyboard.type( '1' );
diff --git a/test/e2e/specs/site-editor/block-removal.spec.js b/test/e2e/specs/site-editor/block-removal.spec.js
index 14f0ae422cc988..7fc547c19e59e3 100644
--- a/test/e2e/specs/site-editor/block-removal.spec.js
+++ b/test/e2e/specs/site-editor/block-removal.spec.js
@@ -30,7 +30,9 @@ test.describe( 'Site editor block removal prompt', () => {
.click();
// Select and try to remove Query Loop block
- const listView = page.getByRole( 'region', { name: 'List View' } );
+ const listView = page.getByRole( 'region', {
+ name: 'Document Overview',
+ } );
await listView.getByRole( 'link', { name: 'Query Loop' } ).click();
await page.keyboard.press( 'Backspace' );
@@ -52,7 +54,9 @@ test.describe( 'Site editor block removal prompt', () => {
.click();
// Select and open child blocks of Query Loop block
- const listView = page.getByRole( 'region', { name: 'List View' } );
+ const listView = page.getByRole( 'region', {
+ name: 'Document Overview',
+ } );
await listView.getByRole( 'link', { name: 'Query Loop' } ).click();
await page.keyboard.press( 'ArrowRight' );
@@ -79,7 +83,9 @@ test.describe( 'Site editor block removal prompt', () => {
.click();
// Select Query Loop list item
- const listView = page.getByRole( 'region', { name: 'List View' } );
+ const listView = page.getByRole( 'region', {
+ name: 'Document Overview',
+ } );
await listView.getByRole( 'link', { name: 'Query Loop' } ).click();
// Reveal its inner blocks in the list view
diff --git a/test/e2e/specs/site-editor/list-view.spec.js b/test/e2e/specs/site-editor/list-view.spec.js
index ba8a316ee10c4d..db514463a73d76 100644
--- a/test/e2e/specs/site-editor/list-view.spec.js
+++ b/test/e2e/specs/site-editor/list-view.spec.js
@@ -26,7 +26,7 @@ test.describe( 'Site Editor List View', () => {
editor,
} ) => {
await expect(
- page.locator( 'role=region[name="List View"i]' )
+ page.locator( 'role=region[name="Document Overview"i]' )
).toBeHidden();
// Turn on block list view by default.
@@ -37,7 +37,7 @@ test.describe( 'Site Editor List View', () => {
await page.reload();
await expect(
- page.locator( 'role=region[name="List View"i]' )
+ page.locator( 'role=region[name="Document Overview"i]' )
).toBeVisible();
// The preferences cleanup.
@@ -121,7 +121,7 @@ test.describe( 'Site Editor List View', () => {
await pageUtils.pressKeys( 'shift+Tab' );
await expect(
page
- .getByRole( 'region', { name: 'List View' } )
+ .getByRole( 'region', { name: 'Document Overview' } )
.getByRole( 'button', {
name: 'Close',
} )
diff --git a/test/e2e/specs/site-editor/navigation-editor.spec.js b/test/e2e/specs/site-editor/navigation-editor.spec.js
index 47519dc3ba6138..2813ceb13748a5 100644
--- a/test/e2e/specs/site-editor/navigation-editor.spec.js
+++ b/test/e2e/specs/site-editor/navigation-editor.spec.js
@@ -45,7 +45,7 @@ test.describe( 'Editing Navigation Menus', () => {
const listView = page
.getByRole( 'region', {
- name: 'List View',
+ name: 'Document Overview',
} )
.getByRole( 'treegrid', {
name: 'Block navigation structure',
@@ -99,7 +99,7 @@ test.describe( 'Editing Navigation Menus', () => {
// Check the standard tabs are not present.
await expect(
- sidebar.getByRole( 'tab', { name: 'List View' } )
+ sidebar.getByRole( 'tab', { name: 'Document Overview' } )
).toBeHidden();
await expect(
sidebar.getByRole( 'tab', { name: 'Settings' } )
diff --git a/test/e2e/specs/site-editor/style-variations.spec.js b/test/e2e/specs/site-editor/style-variations.spec.js
index f991b512e840df..c4dad7c7d7546c 100644
--- a/test/e2e/specs/site-editor/style-variations.spec.js
+++ b/test/e2e/specs/site-editor/style-variations.spec.js
@@ -157,7 +157,7 @@ test.describe( 'Global styles variations', () => {
await page.click( 'role=button[name="pink"i]' );
await page.click( 'role=button[name="Back"i]' );
await page.click( 'role=button[name="Colors styles"i]' );
- await page.click( 'role=button[name="Color palettes"i]' );
+ await page.click( 'role=button[name="Edit palette"i]' );
await expect(
page.locator( 'role=option[name="Color: Foreground"i]' )
diff --git a/test/native/setup.js b/test/native/setup.js
index 12b61d15553cae..e93d2248bd03cb 100644
--- a/test/native/setup.js
+++ b/test/native/setup.js
@@ -109,6 +109,7 @@ jest.mock( '@wordpress/react-native-bridge', () => {
subscribeOnUndoPressed: jest.fn(),
subscribeOnRedoPressed: jest.fn(),
subscribeConnectionStatus: jest.fn( () => ( { remove: jest.fn() } ) ),
+ subscribeToContentUpdate: jest.fn(),
requestConnectionStatus: jest.fn( ( callback ) => callback( true ) ),
editorDidMount: jest.fn(),
showAndroidSoftKeyboard: jest.fn(),
diff --git a/test/performance/specs/site-editor.spec.js b/test/performance/specs/site-editor.spec.js
index dd052db5035dbe..4b31b24460dc3d 100644
--- a/test/performance/specs/site-editor.spec.js
+++ b/test/performance/specs/site-editor.spec.js
@@ -333,7 +333,7 @@ test.describe( 'Site Editor Performance', () => {
.click();
} else {
await page
- .getByRole( 'button', { name: 'Transform into:' } )
+ .getByRole( 'button', { name: 'Design' } )
.click();
}