Skip to content

Only modify uploads directory when running core test suite. #15914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
peterwilsoncc wants to merge 1 commit into from
+11 −2
Closed

Only modify uploads directory when running core test suite. #15914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion tests/phpunit/includes/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );

/*
Expand Down
4 changes: 3 additions & 1 deletion tests/phpunit/includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, '/' );
}

/**
Expand Down
Loading