Changeset 38907

Timestamp:

10/25/2016 10:24:57 AM (8 years ago)

Author:

pento

Message:

Tests: Use a minimal theme for tests.

This functionality was originally added in [38858], using symlink() to put a link to the theme in WordPress' themes directory. Unfortunately, not all installs have write access to the themes directory, causing unit tests to fail.

The new method is to add the test theme directory to $wp_theme_directories, and fix the handful of tests that don't expect $wp_theme_directories to have multiple entries.

The test install/bootstrap routines now also check that WP_DEFAULT_THEME is defined, in case the tests are being run on a system that hasn't upgraded its' wp-tests-config.php.

See #31550.
Fixes #38457.

Location:

trunk/tests/phpunit

Files:

• includes/bootstrap.php (modified) (2 diffs)
• includes/functions.php (modified) (1 diff)
• includes/install.php (modified) (1 diff)
• tests/theme.php (modified) (2 diffs)

trunk/tests/phpunit/includes/bootstrap.php

@@ -17 +17 @@
  * See: https://github.com/sebastianbergmann/phpunit/issues/325
  */
-global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer;
+global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer, $wp_theme_directories;
 
 if ( !is_readable( $config_file_path ) ) {
@@ -54 +54 @@
 $phpmailer = new MockPHPMailer();
 
-// Add a symlink to the empty default theme to the themes directory, so it can be used for the tests.
-_symlink_default_theme();
+// Set the theme to our special empty theme, to avoid interference from the current Twenty* theme.
+if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
+    define( 'WP_DEFAULT_THEME', 'default' );
+}
+$wp_theme_directories = array( DIR_TESTDATA . '/themedir1' );
 
 system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );

trunk/tests/phpunit/includes/functions.php

@@ -162 +162 @@
     return $uploads;
 }
-
-/**
- * Helper functions to link and unlink the empty default theme into the WordPress install
- */
-function _symlink_default_theme() {
-    _unlink_default_theme();
-    symlink( DIR_TESTDATA . '/themedir1/default', ABSPATH . '/wp-content/themes/default' );
-}
-
-function _unlink_default_theme() {
-    if ( file_exists( ABSPATH . '/wp-content/themes/default' ) ) {
-        unlink( ABSPATH . '/wp-content/themes/default' );
-    }
-}
-// Only unlink when we're in the main process.
-if ( 'phpunit' === substr( $GLOBALS['argv'][0], -7 ) ) {
-    register_shutdown_function( '_unlink_default_theme' );
-}

trunk/tests/phpunit/includes/install.php

@@ -9 +9 @@
 $config_file_path = $argv[1];
 $multisite = ! empty( $argv[2] );
+
+// Set the theme to our special empty theme, to avoid interference from the current Twenty* theme.
+if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
+    define( 'WP_DEFAULT_THEME', 'default' );
+}
+$wp_theme_directories = array( dirname( __FILE__ ) . '/../data/themedir1' );
 
 define( 'WP_INSTALLING', true );

trunk/tests/phpunit/tests/theme.php

@@ -15 +15 @@
 
     function setUp() {
+        global $wp_theme_directories;
+
         parent::setUp();
+
+        $backup_wp_theme_directories = $wp_theme_directories;
+        $wp_theme_directories = array( WP_CONTENT_DIR . '/themes' );
+
         add_filter( 'extra_theme_headers', array( $this, '_theme_data_extra_headers' ) );
         wp_clean_themes_cache();
@@ -22 +28 @@
 
     function tearDown() {
+        global $wp_theme_directories;
+
+        $wp_theme_directories = $this->wp_theme_directories;
+
         remove_filter( 'extra_theme_headers', array( $this, '_theme_data_extra_headers' ) );
         wp_clean_themes_cache();
         unset( $GLOBALS['wp_themes'] );
+
         parent::tearDown();
     }