Fix block bindings registration unit test and test setup

WordPress · michalczaplinski · Jan 17, 2024 · Jan 17, 2024 · Jan 17, 2024 · Jan 17, 2024
commit 3f242d3caf3e8b2a0439945a290e9554722b07e8
diff --git a/tests/phpunit/tests/block-bindings.php b/tests/phpunit/tests/block-bindings.php
@@ -12,20 +12,33 @@
 class WP_Block_Bindings_Registry_Test extends WP_UnitTestCase {
 
 	/**
-	* Test
+	 * Set up before each test.
+	 *
+	 * @since 6.5.0
+	 */
+	public function set_up() {
+		foreach ( get_all_registered_block_bindings_sources() as $source_name => $source_properties ) {
+			unregister_block_bindings_source( $source_name );
+		}
+
+		parent::set_up();
+	}
+
+	/**
+	* Test if the block content is updated with the value returned by the source.
+	*
+	* @since 6.5.0
 	*
 	* @covers WP_Block_Bindings_Registry::
 	*/
 	public function test_replace_html_for_paragraph_content() {
-		$wp_block_bindings = WP_Block_Bindings_Registry::get_instance();
-
-		$source_name        = 'test_source';
+		$source_name        = 'test/source';
 		$label              = 'Test Source';
 		$get_value_callback = function () {
 			return 'test source value';
 		};
 
-		$wp_block_bindings->register(
+		register_block_bindings_source(
 			$source_name,
 			array(
 				'label'              => $label,
@@ -34,7 +47,7 @@ public function test_replace_html_for_paragraph_content() {
 		);
 
 		$block_content = <<<HTML
-<!-- wp:paragraph {"metadata":{"bindings":{"content":{"source":{"name":"test_source","attributes":{"value":"text_custom_field"}}}}}} --><p>This should not appear</p><!-- /wp:paragraph -->
+<!-- wp:paragraph {"metadata":{"bindings":{"content":{"source":{"name":"test/source","attributes":{"value":"text_custom_field"}}}}}} --><p>This should not appear</p><!-- /wp:paragraph -->
 HTML;
 
 		$parsed_blocks = parse_blocks( $block_content );

diff --git a/tests/phpunit/tests/block-bindings/register.php b/tests/phpunit/tests/block-bindings/register.php
@@ -23,9 +23,6 @@ class Tests_Block_Bindings_Register extends WP_UnitTestCase {
 	 */
 	public function set_up() {
 		foreach ( get_all_registered_block_bindings_sources() as $source_name => $source_properties ) {
-			if ( str_starts_with( $source_name, 'test/' ) ) {
-				unregister_block_bindings_source( $source_name );
-			}
 			unregister_block_bindings_source( $source_name );
 		}
 
@@ -39,9 +36,6 @@ public function set_up() {
 	 */
 	public function tear_down() {
 		foreach ( get_all_registered_block_bindings_sources() as $source_name => $source_properties ) {
-			if ( str_starts_with( $source_name, 'test/' ) ) {
-				unregister_block_bindings_source( $source_name );
-			}
 			unregister_block_bindings_source( $source_name );
 		}