vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-06 23:58:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: Replace most instances of wpmu_delete_blog() not specifically testing that function with wp_delete_site().

Browse Source 
Follow-up to [47011].

See #47195.

git-svn-id: https://develop.svn.wordpress.org/trunk@47012 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2019-12-25 18:15:13 +00:00
parent ebe75fb903
commit f8051662b1
18 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/multisite/network.php
+5 -11
View File
@@ -63,7 +63,7 @@ if ( is_multisite() ) :
global $wpdb;
foreach ( self::$different_site_ids as $id ) {
wpmu_delete_blog( $id, true );
wp_delete_site( $id );
}
$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", self::$different_network_id ) );
@@ -155,7 +155,7 @@ if ( is_multisite() ) :
$actual = (int) get_blog_count(); // Count only updated when cron runs, so should be unchanged.
foreach ( $site_ids as $site_id ) {
wpmu_delete_blog( $site_id, true );
wp_delete_site( $site_id );
}
wp_update_network_counts();
@@ -175,7 +175,7 @@ if ( is_multisite() ) :
remove_filter( 'enable_live_network_counts', '__return_false' );
foreach ( $site_ids as $site_id ) {
wpmu_delete_blog( $site_id, true );
wp_delete_site( $site_id );
}
wp_update_network_counts();
@@ -195,7 +195,7 @@ if ( is_multisite() ) :
remove_filter( 'enable_live_network_counts', '__return_true' );
foreach ( $site_ids as $site_id ) {
wpmu_delete_blog( $site_id, true );
wp_delete_site( $site_id );
}
wp_update_network_counts();
@@ -590,13 +590,7 @@ if ( is_multisite() ) :
public function test_wpmu_create_blog_updates_correct_network_site_count() {
$original_count = get_blog_count( self::$different_network_id );
$site_id = self::factory()->blog->create(
array(
'domain' => 'example.org',
'path' => '/',
'site_id' => self::$different_network_id,
)
);
$site_id = wpmu_create_blog( 'example.org', '/', '', 1, array(), self::$different_network_id );
$result = get_blog_count( self::$different_network_id );