Additional test coverage

Author: ockham

tests/phpunit/tests/blocks/applyBlockHooksToContentFromPostObject.php

@@ -130,21 +130,59 @@ public function test_apply_block_hooks_to_content_from_post_object_inserts_hooke
 		$this->assertSame( $expected, $actual );
 	}
 
+	/**
+	 * @ticket 76176
+	 */
+	public function test_apply_block_hooks_to_content_from_post_object_sets_ignored_hooked_blocks() {
+		$ignored_hooked_blocks_at_root = array();
+
+		$expected = '<!-- wp:tests/hooked-block-first-child /-->' .
+			'<!-- wp:heading {"level":1,"metadata":{"ignoredHookedBlocks":["tests/hooked-block"]}} -->' .
+			'<h1>Hello World!</h1>' .
+			'<!-- /wp:heading -->' .
+			'<!-- wp:tests/hooked-block /-->';
+		$actual   = apply_block_hooks_to_content_from_post_object(
+			self::$post->post_content,
+			self::$post,
+			'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata',
+			$ignored_hooked_blocks_at_root
+		);
+		$this->assertSame( $expected, $actual, "Markup wasn't updated correctly." );
+		$this->assertSame(
+			array( 'tests/hooked-block-first-child' ),
+			$ignored_hooked_blocks_at_root,
+			"Hooked block added at 'first_child' position wasn't added to ignoredHookedBlocks metadata."
+		);
+	}
+
 	/**
 	 * @ticket 62716
+	 * @ticket 76176
 	 */
 	public function test_apply_block_hooks_to_content_from_post_object_respects_ignored_hooked_blocks_post_meta() {
-		$expected = self::$post_with_ignored_hooked_block->post_content . '<!-- wp:tests/hooked-block /-->';
+		$ignored_hooked_blocks_at_root = array();
+
+		$expected = '<!-- wp:heading {"level":1,"metadata":{"ignoredHookedBlocks":["tests/hooked-block"]}} -->' .
+			'<h1>Hello World!</h1>' .
+			'<!-- /wp:heading -->' .
+			'<!-- wp:tests/hooked-block /-->';
 		$actual   = apply_block_hooks_to_content_from_post_object(
 			self::$post_with_ignored_hooked_block->post_content,
 			self::$post_with_ignored_hooked_block,
-			'insert_hooked_blocks'
+			'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata',
+			$ignored_hooked_blocks_at_root
 		);
 		$this->assertSame( $expected, $actual );
+		$this->assertSame(
+			array( 'tests/hooked-block-first-child' ),
+			$ignored_hooked_blocks_at_root,
+			"Pre-existing ignored hooked block at root level wasn't reflected in metadata."
+		);
 	}
 
 	/**
 	 * @ticket 63287
+	 * @ticket 76176
 	 */
 	public function test_apply_block_hooks_to_content_from_post_object_does_not_insert_hooked_block_before_container_block() {
 		$filter = function ( $hooked_block_types, $relative_position, $anchor_block_type ) {
@@ -155,31 +193,50 @@ public function test_apply_block_hooks_to_content_from_post_object_does_not_inse
 			return $hooked_block_types;
 		};
 
+		$ignored_hooked_blocks_at_root = array();
+
 		$expected = '<!-- wp:tests/hooked-block-first-child /-->' .
-			self::$post->post_content .
+			'<!-- wp:heading {"level":1,"metadata":{"ignoredHookedBlocks":["tests/hooked-block"]}} -->' .
+			'<h1>Hello World!</h1>' .
+			'<!-- /wp:heading -->' .
 			'<!-- wp:tests/hooked-block /-->';
 
 		add_filter( 'hooked_block_types', $filter, 10, 3 );
 		$actual = apply_block_hooks_to_content_from_post_object(
 			self::$post->post_content,
 			self::$post,
-			'insert_hooked_blocks'
+			'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata',
+			$ignored_hooked_blocks_at_root
 		);
 		remove_filter( 'hooked_block_types', $filter, 10 );
 
-		$this->assertSame( $expected, $actual );
+		$this->assertSame( $expected, $actual, "Hooked block added before 'core/post-content' block shouldn't be inserted." );
+		$this->assertSame(
+			array( 'tests/hooked-block-first-child' ),
+			$ignored_hooked_blocks_at_root,
+			"ignoredHookedBlocks metadata wasn't set correctly."
+		);
 	}
 
 	/**
 	 * @ticket 62716
+	 * @ticket 76176
 	 */
 	public function test_apply_block_hooks_to_content_from_post_object_inserts_hooked_block_if_content_contains_no_blocks() {
+		$ignored_hooked_blocks_at_root = array();
+
 		$expected = '<!-- wp:tests/hooked-block-first-child /-->' . self::$post_with_non_block_content->post_content;
 		$actual   = apply_block_hooks_to_content_from_post_object(
 			self::$post_with_non_block_content->post_content,
 			self::$post_with_non_block_content,
-			'insert_hooked_blocks'
+			'insert_hooked_blocks_and_set_ignored_hooked_blocks_metadata',
+			$ignored_hooked_blocks_at_root
+		);
+		$this->assertSame( $expected, $actual, "Markup wasn't updated correctly." );
+		$this->assertSame(
+			array( 'tests/hooked-block-first-child' ),
+			$ignored_hooked_blocks_at_root,
+			"Hooked block added at 'first_child' position wasn't added to ignoredHookedBlocks metadata."
 		);
-		$this->assertSame( $expected, $actual );
 	}
 }