Tests: Limit upload directory isolation to the Core test suite.

Preserve default upload paths for plugin and theme test suites. Only define and clean the dedicated uploads directory when `WP_RUN_CORE_TESTS` is enabled.

Developed in: #15914

Props peterwilsoncc.
See #63532.


git-svn-id: https://develop.svn.wordpress.org/trunk@65409 602fd350-edb4-49c9-b593-d223f7449a82

Author: lancewillett

tests/phpunit/includes/bootstrap.php

@@ -250,10 +250,17 @@
 define( 'REST_TESTS_IMPOSSIBLY_HIGH_NUMBER', 99999999 );
 
 /*
+ * Isolate uploads in a dedicated directory when running the core test suite only,
+ * so that plugins and themes using the test suite keep the default uploads location.
+ *
  * Tests that cover the upload_path and upload_url_path options run in a separate process
  * with WP_TESTS_SKIP_UPLOADS_CONSTANT set, as UPLOADS overrides those options.
  */
-if ( ! defined( 'UPLOADS' ) && '1' !== getenv( 'WP_TESTS_SKIP_UPLOADS_CONSTANT' ) ) {
+if (
+	defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS
+	&& ! defined( 'UPLOADS' )
+	&& '1' !== getenv( 'WP_TESTS_SKIP_UPLOADS_CONSTANT' )
+) {
 	define( 'UPLOADS', 'wp-content/test-suite-uploads' );
 
 	/*

tests/phpunit/includes/functions.php

@@ -360,7 +360,9 @@ function _upload_dir_https( $uploads ) {
  * @return string The upload URL.
  */
 function _upload_get_url( $path = '', $scheme = 'http' ) {
-	return $scheme . '://' . WP_TESTS_DOMAIN . '/' . trailingslashit( UPLOADS ) . ltrim( $path, '/' );
+	$uploads = defined( 'UPLOADS' ) ? UPLOADS : 'wp-content/uploads';
+
+	return $scheme . '://' . WP_TESTS_DOMAIN . '/' . trailingslashit( $uploads ) . ltrim( $path, '/' );
 }
 
 /**