Changeset 36949

Timestamp:

03/10/2016 06:56:56 PM (9 years ago)

Author:

obenland

Message:

Tests: Introduce multisite unit tests.

Makes sure custom logo functions work for other sites within a network.
Fixes a bug in get_custom_logo() where the correct logo was returned, but
linked to the wrong site.

H/t ocean90.
See #33755, #36086.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (2 diffs)
• tests/phpunit/tests/general/template.php (modified) (2 diffs)

trunk/src/wp-includes/general-template.php

@@ -877 +877 @@
 
     $custom_logo_id = get_theme_mod( 'custom_logo' );
-
-    if ( is_multisite() && ms_is_switched() ) {
-        restore_current_blog();
-    }
-    $size = get_theme_support( 'custom-logo', 'size' );
+    $size           = get_theme_support( 'custom-logo', 'size' );
 
     // We have a logo. Logo is go.
@@ -901 +897 @@
             esc_attr( $size )
         );
+    }
+
+    if ( is_multisite() && ms_is_switched() ) {
+        restore_current_blog();
     }
 

trunk/tests/phpunit/tests/general/template.php

@@ -220 +220 @@
     /**
      * @group custom_logo
+     * @group multisite
+     */
+    function test_has_custom_logo_returns_true_when_called_for_other_site_with_custom_logo_set() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'This test requires multisite.' );
+        }
+
+        $blog_id = $this->factory->blog->create();
+        switch_to_blog( $blog_id );
+        $this->_set_custom_logo();
+        restore_current_blog();
+
+        $this->assertTrue( has_custom_logo( $blog_id ) );
+    }
+
+    /**
+     * @group custom_logo
+     * @group multisite
+     */
+    function test_has_custom_logo_returns_false_when_called_for_other_site_without_custom_logo_set() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'This test requires multisite.' );
+        }
+
+        $blog_id = $this->factory->blog->create();
+
+        $this->assertFalse( has_custom_logo( $blog_id ) );
+    }
+
+    /**
+     * @group custom_logo
      *
      * @since 4.5.0
@@ -233 +264 @@
         $this->_remove_custom_logo();
         $this->assertEmpty( get_custom_logo() );
+    }
+
+    /**
+     * @group custom_logo
+     * @group multisite
+     */
+    function test_get_custom_logo_returns_logo_when_called_for_other_site_with_custom_logo_set() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'This test requires multisite.' );
+        }
+
+        $blog_id = $this->factory->blog->create();
+        switch_to_blog( $blog_id );
+
+        $this->_set_custom_logo();
+        $home_url = get_home_url( $blog_id, '/' );
+        $size     = get_theme_support( 'custom-logo', 'size' );
+        $image    = wp_get_attachment_image( $this->custom_logo_id, $size, false, array(
+            'class'     => "custom-logo attachment-$size",
+            'data-size' => $size,
+            'itemprop'  => 'logo',
+        ) );
+        restore_current_blog();
+
+        $expected_custom_logo =  '<a href="' . $home_url . '" class="custom-logo-link" rel="home" itemprop="url">' . $image . '</a>';
+        $this->assertEquals( $expected_custom_logo, get_custom_logo( $blog_id ) );
     }