Changeset 52381 for trunk/tests/phpunit/tests/rest-api/rest-server.php

Timestamp:

12/15/2021 06:06:15 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Add an assertion to test the WP_REST_Server::add_site_logo_to_index() method.

Additionally:

• Move the test for WP_REST_Server::add_active_theme_link_to_index() to a more logical place.
• Replace assertEquals() with assertSame() in site icon test to also check the type of the value.
• Use a more consistent pattern for the tests.

Follow-up to [51241], [52080].

Props ignatggeorgiev, desrosj, SergeyBiryukov.
Fixes #53516. See #53363.

File:

• trunk/tests/phpunit/tests/rest-api/rest-server.php (modified) (3 diffs)

trunk/tests/phpunit/tests/rest-api/rest-server.php

@@ -1026 +1026 @@
         $this->assertArrayNotHasKey( 'wp:active-theme', $index->get_links() );
 
-        // Check site icon.
+        // Check site logo and icon.
+        $this->assertArrayHasKey( 'site_logo', $data );
         $this->assertArrayHasKey( 'site_icon', $data );
     }
 
     /**
+     * @ticket 50152
+     */
+    public function test_index_includes_link_to_active_theme_if_authenticated() {
+        $server = new WP_REST_Server();
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+
+        $request = new WP_REST_Request( 'GET', '/' );
+        $index   = $server->dispatch( $request );
+
+        $this->assertArrayHasKey( 'https://api.w.org/active-theme', $index->get_links() );
+    }
+
+    /**
      * @ticket 52321
      */
-    public function test_get_index_with_site_icon() {
+    public function test_index_includes_site_icon() {
         $server = new WP_REST_Server();
         update_option( 'site_icon', self::$icon_id );
@@ -1042 +1056 @@
 
         $this->assertArrayHasKey( 'site_icon', $data );
-        $this->assertEquals( self::$icon_id, $data['site_icon'] );
+        $this->assertSame( self::$icon_id, $data['site_icon'] );
     }
 
@@ -2081 +2095 @@
 
     /**
-     * @ticket 50152
-     */
-    public function test_index_includes_link_to_active_theme_if_authenticated() {
-        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
-
-        $index = rest_do_request( '/' );
-        $this->assertArrayHasKey( 'https://api.w.org/active-theme', $index->get_links() );
-    }
-
-    /**
      * @ticket 53056
      */