Changeset 41380 for trunk/tests/phpunit/tests/multisite/site.php

Timestamp:

09/15/2017 11:14:49 AM (8 years ago)

Author:

flixos90

Message:

Multisite: Introduce get_main_site_id().

This function can be used to easily get the main site ID of a given network via the optional $network_id parameter, which defaults to the current network. The existing is_main_site() now uses the new function internally and now accepts an optional $network_id parameter as well.

The main purpose of the new function at this point is to ensure that the WP_Network::$blog_id property is always set. Magic getters in the class have been adjusted to auto-fill the property when it is accessed and empty. Furthermore the function encapsulates logic that was previously part of ms_load_current_site_and_network() and has been replaced with a call to the function now.

Props spacedmonkey, jeremyfelt, johnjamesjacoby, flixos90.
Fixes #29684.

File:

• trunk/tests/phpunit/tests/multisite/site.php (modified) (3 diffs)

trunk/tests/phpunit/tests/multisite/site.php

@@ -12 +12 @@
     protected $suppress = false;
     protected static $network_ids;
+    protected static $site_ids;
 
     function setUp() {
@@ -34 +35 @@
         }
         unset( $id );
+
+        self::$site_ids = array(
+            'make.wordpress.org/'     => array( 'domain' => 'make.wordpress.org', 'path' => '/',         'site_id' => self::$network_ids['make.wordpress.org/'] ),
+            'make.wordpress.org/foo/' => array( 'domain' => 'make.wordpress.org', 'path' => '/foo/',     'site_id' => self::$network_ids['make.wordpress.org/'] ),
+        );
+
+        foreach ( self::$site_ids as &$id ) {
+            $id = $factory->blog->create( $id );
+        }
+        unset( $id );
     }
 
     public static function wpTearDownAfterClass() {
         global $wpdb;
+
+        foreach( self::$site_ids as $id ) {
+            wpmu_delete_blog( $id, true );
+        }
 
         foreach( self::$network_ids as $id ) {
@@ -1029 +1044 @@
         return $original_value;
     }
+
+    /**
+     * @ticket 29684
+     */
+    public function test_is_main_site_different_network() {
+        $this->assertTrue( is_main_site( self::$site_ids['make.wordpress.org/'], self::$network_ids['make.wordpress.org/'] ) );
+    }
+
+    /**
+     * @ticket 29684
+     */
+    public function test_is_main_site_different_network_random_site() {
+        $this->assertFalse( is_main_site( self::$site_ids['make.wordpress.org/foo/'], self::$network_ids['make.wordpress.org/'] ) );
+    }
 }