Changeset 47014

Timestamp:

12/26/2019 12:25:20 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Set network_id instead of site_id in WP_UnitTest_Factory_For_Blog defaults.

Follow-up to [47011], [47013].

See #47195.

File:

• trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php (modified) (2 diffs)

trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php

@@ -17 +17 @@
         parent::__construct( $factory );
         $this->default_generation_definitions = array(
-            'domain'  => $current_site->domain,
-            'path'    => new WP_UnitTest_Generator_Sequence( $base . 'testpath%s' ),
-            'title'   => new WP_UnitTest_Generator_Sequence( 'Site %s' ),
-            'site_id' => $current_site->id,
+            'domain'     => $current_site->domain,
+            'path'       => new WP_UnitTest_Generator_Sequence( $base . 'testpath%s' ),
+            'title'      => new WP_UnitTest_Generator_Sequence( 'Site %s' ),
+            'network_id' => $current_site->id,
         );
     }
@@ -35 +35 @@
 
         // Map some arguments for backward compatibility with `wpmu_create_blog()` previously used here.
-        if ( ! isset( $args['network_id'] ) && isset( $args['site_id'] ) ) {
+        if ( isset( $args['site_id'] ) ) {
             $args['network_id'] = $args['site_id'];
             unset( $args['site_id'] );