Changeset 41883 for trunk/tests/phpunit/tests/multisite/siteDetails.php

Timestamp:

10/16/2017 10:28:52 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Revert [41719].

While get_site_by() makes sense as a more explicit and less complex replacement for get_blog_details(), it is not ready yet in terms of caching, where it currently falls short of the older function under specific circumstances.

See #40180, #40228.

File:

• trunk/tests/phpunit/tests/multisite/siteDetails.php (modified) (2 diffs)

trunk/tests/phpunit/tests/multisite/siteDetails.php

@@ -33 +33 @@
      * @ticket 40063
      */
+    public function test_update_whitelisted_option_deletes_blog_details_cache( $whitelisted_option, $temporary_value ) {
+        $blog_details = get_blog_details();
+
+        $original_value = $blog_details->$whitelisted_option;
+        update_option( $whitelisted_option, $temporary_value );
+
+        $cached_result = wp_cache_get( $blog_details->id, 'blog-details' );
+
+        /* Reset to original value. */
+        update_option( $whitelisted_option, $original_value );
+
+        $this->assertFalse( $cached_result );
+    }
+
+    /**
+     * @dataProvider data_whitelisted_options
+     *
+     * @ticket 40063
+     */
     public function test_update_whitelisted_option_does_not_delete_site_cache( $whitelisted_option, $temporary_value ) {
         $site = get_site();
@@ -40 +59 @@
 
         $cached_result = wp_cache_get( $site->id, 'sites' );
+
+        /* Reset to original value. */
+        update_option( $whitelisted_option, $original_value );
+
+        $this->assertNotFalse( $cached_result );
+    }
+
+    /**
+     * @dataProvider data_whitelisted_options
+     *
+     * @ticket 40063
+     */
+    public function test_update_whitelisted_option_does_not_delete_short_blog_details_cache( $whitelisted_option, $temporary_value ) {
+        $blog_details = get_blog_details( null, false );
+
+        $original_value = get_option( $whitelisted_option );
+        update_option( $whitelisted_option, $temporary_value );
+
+        $cached_result = wp_cache_get( $blog_details->id . 'short', 'blog-details' );
 
         /* Reset to original value. */