Changeset 50838 for trunk/tests/phpunit/tests/dependencies/styles.php

Timestamp:

05/11/2021 04:26:28 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Editor: Some documentation and test improvements for loading separate assets for core blocks:

• Move should_load_separate_core_block_assets() to a more appropriate place.
• Update DocBlocks and inline comments per the documentation standards.
• Document the $wp_styles global in wp_maybe_inline_styles().
• List the expected result first in unit test assertions.
• Remove a duplicate unit test.
• Add missing @covers tags.

Follow-up to [50836], [50837].

See #50328, #52620, #53180.

File:

• trunk/tests/phpunit/tests/dependencies/styles.php (modified) (2 diffs)

trunk/tests/phpunit/tests/dependencies/styles.php

@@ -423 +423 @@
 
     /**
-     * Tests that the main "style.css" file gets enqueued when the site doesn't opt-in to separate_core_block_assets.
+     * Tests that the main "style.css" file gets enqueued when the site doesn't opt in to separate core block assets.
      *
      * @ticket 50263
-     */
-    function test_common_block_styles_for_viewing_without_split_styles() {
+     *
+     * @covers ::wp_default_styles
+     */
+    function test_block_styles_for_viewing_without_split_styles() {
         add_filter( 'separate_core_block_assets', '__return_false' );
         wp_default_styles( $GLOBALS['wp_styles'] );
 
         $this->assertSame(
-            $GLOBALS['wp_styles']->registered['wp-block-library']->src,
-            '/' . WPINC . '/css/dist/block-library/style.css'
+            '/' . WPINC . '/css/dist/block-library/style.css',
+            $GLOBALS['wp_styles']->registered['wp-block-library']->src
         );
     }
 
     /**
-     * Tests that the "common.css" file gets enqueued when the site opts-in to separate_core_block_assets.
+     * Tests that the "common.css" file gets enqueued when the site opts in to separate core block assets.
      *
      * @ticket 50263
-     */
-    function test_common_block_styles_for_viewing_with_split_styles() {
-        add_filter( 'separate_core_block_assets', '__return_false' );
-        wp_default_styles( $GLOBALS['wp_styles'] );
-
-        $this->assertSame(
-            $GLOBALS['wp_styles']->registered['wp-block-library']->src,
-            '/' . WPINC . '/css/dist/block-library/style.css'
-        );
-    }
-
+     *
+     * @covers ::wp_default_styles
+     */
     function test_block_styles_for_viewing_with_split_styles() {
         add_filter( 'separate_core_block_assets', '__return_true' );
@@ -457 +451 @@
 
         $this->assertSame(
-            $GLOBALS['wp_styles']->registered['wp-block-library']->src,
-            '/' . WPINC . '/css/dist/block-library/common.css'
+            '/' . WPINC . '/css/dist/block-library/common.css',
+            $GLOBALS['wp_styles']->registered['wp-block-library']->src
         );
     }