Changeset 53153 for trunk/tests/phpunit/tests/block-supports/spacing.php

Timestamp:

04/12/2022 09:38:18 AM (3 years ago)

Author:

gziolo

Message:

Tests: Improve test cleanup for block supports

Let's unregister the block in the tear_down method. The block will be unregistered even if the test fails.

Props ramonopoly, antonvlasenko.
See #55505.
Follow-up [53085], [53076].

File:

• trunk/tests/phpunit/tests/block-supports/spacing.php (modified) (10 diffs)

trunk/tests/phpunit/tests/block-supports/spacing.php

@@ -5 +5 @@
 class Test_Block_Supports_Spacing extends WP_UnitTestCase {
     /**
+     * @var string|null
+     */
+    private $test_block_name;
+
+    function set_up() {
+        parent::set_up();
+        $this->test_block_name = null;
+    }
+
+    function tear_down() {
+        unregister_block_type( $this->test_block_name );
+        $this->test_block_name = null;
+        parent::set_up();
+    }
+
+    /**
      * @ticket 55505
      *
@@ -10 +26 @@
      */
     function test_spacing_style_is_applied() {
-        $block_name = 'test/spacing-style-is-applied';
+        $this->test_block_name = 'test/spacing-style-is-applied';
         register_block_type(
-            $block_name,
+            $this->test_block_name,
             array(
                 'api_version' => 2,
@@ -30 +46 @@
         );
         $registry   = WP_Block_Type_Registry::get_instance();
-        $block_type = $registry->get_registered( $block_name );
+        $block_type = $registry->get_registered( $this->test_block_name );
         $block_atts = array(
             'style' => array(
@@ -52 +68 @@
 
         $this->assertSame( $expected, $actual );
-        unregister_block_type( $block_name );
     }
 
@@ -61 +76 @@
      */
     function test_spacing_with_skipped_serialization_block_supports() {
-        $block_name = 'test/spacing-with-skipped-serialization-block-supports';
+        $this->test_block_name = 'test/spacing-with-skipped-serialization-block-supports';
         register_block_type(
-            $block_name,
+            $this->test_block_name,
             array(
                 'api_version' => 2,
@@ -82 +97 @@
         );
         $registry   = WP_Block_Type_Registry::get_instance();
-        $block_type = $registry->get_registered( $block_name );
+        $block_type = $registry->get_registered( $this->test_block_name );
         $block_atts = array(
             'style' => array(
@@ -102 +117 @@
 
         $this->assertSame( $expected, $actual );
-        unregister_block_type( $block_name );
     }
 
@@ -111 +125 @@
      */
     function test_margin_with_individual_skipped_serialization_block_supports() {
-        $block_name = 'test/margin-with-individual-skipped-serialization-block-supports';
+        $this->test_block_name = 'test/margin-with-individual-skipped-serialization-block-supports';
         register_block_type(
-            $block_name,
+            $this->test_block_name,
             array(
                 'api_version' => 2,
@@ -132 +146 @@
         );
         $registry   = WP_Block_Type_Registry::get_instance();
-        $block_type = $registry->get_registered( $block_name );
+        $block_type = $registry->get_registered( $this->test_block_name );
         $block_atts = array(
             'style' => array(
@@ -154 +168 @@
 
         $this->assertSame( $expected, $actual );
-        unregister_block_type( $block_name );
     }
 }