Column Block: enable global template_lock inheritance (#42677)

WordPress · Sep 6, 2022 · 2c8ae8e · 2c8ae8e
1 parent 9082cf5
commit 2c8ae8e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/packages/block-library/src/column/edit.js b/packages/block-library/src/column/edit.js
@@ -25,12 +25,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import { sprintf, __ } from '@wordpress/i18n';
 
 function ColumnEdit( {
-	attributes: {
-		verticalAlignment,
-		width,
-		templateLock = false,
-		allowedBlocks,
-	},
+	attributes: { verticalAlignment, width, templateLock, allowedBlocks },
 	setAttributes,
 	clientId,
 } ) {

diff --git a/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js b/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
@@ -119,22 +119,22 @@ describe( 'cpt locking', () => {
 			);
 		} );
 
-		it( 'can use the global inserter in inner blocks', async () => {
+		it( 'should not allow blocks to be inserted in inner blocks', async () => {
 			await page.click( 'button[aria-label="Two columns; equal split"]' );
-			await page.click(
-				'.wp-block-column .block-editor-button-block-appender'
-			);
-			await page.type( '.block-editor-inserter__search input', 'image' );
-			await pressKeyTimes( 'Tab', 2 );
-			await page.keyboard.press( 'Enter' );
-			await page.click( '.edit-post-header-toolbar__inserter-toggle' );
-			await page.type(
-				'.block-editor-inserter__search input',
-				'gallery'
-			);
-			await pressKeyTimes( 'Tab', 2 );
-			await page.keyboard.press( 'Enter' );
-			expect( await page.$( '.wp-block-gallery' ) ).not.toBeNull();
+			expect(
+				await page.$(
+					'.wp-block-column .block-editor-button-block-appender'
+				)
+			).toBeNull();
+
+			expect(
+				await page.evaluate( () => {
+					const inserter = document.querySelector(
+						'.edit-post-header [aria-label="Add block"], .edit-post-header [aria-label="Toggle block inserter"]'
+					);
+					return inserter.getAttribute( 'disabled' );
+				} )
+			).not.toBeNull();
 		} );
 	} );