Ticket #65621: 65621.diff

tests/phpunit/tests/fonts/font-library/fontLibraryHooks.php

@@ -10 +10 @@
  */
 class Tests_Fonts_FontLibraryHooks extends WP_UnitTestCase {
 
+        /**
+         * Tear down the test fixture.
+         */
+        public function tear_down() {
+                // Remove all fonts uploaded during the tests.
+                $this->remove_added_uploads();
+                parent::tear_down();
+        }
+
         public function test_deleting_font_family_deletes_child_font_faces() {
                 $font_family_id       = self::factory()->post->create(
                         array(

tests/phpunit/tests/fonts/font-library/wpRestFontFacesController.php

@@ -461 +461 @@
                 // Delete the post.
                 wp_delete_post( $data['id'], true );
                 $this->assertFileDoesNotExist( $expected_file_path, 'The font file should have been deleted when the post was deleted.' );
+
+                // Clean up: Delete the subdir test directory.
+                rmdir( WP_CONTENT_DIR . '/uploads/fonts/subdir' );
         }
 
         /**

tests/phpunit/tests/user/getActiveBlogForUser.php

@@ -69 +69 @@
 
                 $result = get_active_blog_for_user( self::$user_id );
 
-                wp_delete_site( $primary_site_id );
+                /*
+                 * Avoid using wp_delete_site() here because it will delete the uploads
+                 * directory without checking if the site is the main one. Otherwise,
+                 * when this test runs in a single site environment (e.g. when running
+                 * grunt precommit), it will delete the entire contents of the uploads
+                 * directory, which we want to avoid.
+                 */
+                wpmu_delete_blog( $primary_site_id, true );
 
                 $this->assertSame( $primary_site_id, $result->id );
         }