From cacd16cf5dad0c5d77d748c8cb070b2fdb09dcbd Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Tue, 1 Nov 2016 03:13:27 +0000 Subject: [PATCH] Themes: Update the unit tests to handle [39064] and #31550. `test_default_theme_in_default_theme_list()` was always being skipped after #31550, this causes it to once again check that the unit tests are up to date and include the latest default theme. `test_default_themes_have_textdomain()` didn't play happy when a default theme wasn't installed on a site. See #31550, #29925, #38551. git-svn-id: https://develop.svn.wordpress.org/trunk@39065 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/theme.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php index b505acf13e..9d8d57182d 100644 --- a/tests/phpunit/tests/theme.php +++ b/tests/phpunit/tests/theme.php @@ -10,7 +10,7 @@ class Tests_Theme extends WP_UnitTestCase { protected $theme_name = 'Twenty Eleven'; protected $default_themes = array( 'twentyten', 'twentyeleven', 'twentytwelve', 'twentythirteen', - 'twentyfourteen', 'twentyfifteen', + 'twentyfourteen', 'twentyfifteen', 'twentysixteen', 'twentyseventeen', ); function setUp() { @@ -187,14 +187,18 @@ class Tests_Theme extends WP_UnitTestCase { * @ticket 29925 */ function test_default_theme_in_default_theme_list() { - if ( 'twenty' === substr( WP_DEFAULT_THEME, 0, 6 ) ) { - $this->assertContains( WP_DEFAULT_THEME, $this->default_themes ); + $latest_default_theme = WP_Theme::get_core_default_theme(); + if ( ! $latest_default_theme->exists() || 'twenty' !== substr( $latest_default_theme->get_stylesheet(), 0, 6 ) ) { + $this->markTestSkipped( 'No Twenty* series default themes are installed' ); } + $this->assertContains( $latest_default_theme->get_stylesheet(), $this->default_themes ); } function test_default_themes_have_textdomain() { foreach ( $this->default_themes as $theme ) { - $this->assertEquals( $theme, wp_get_theme( $theme )->get( 'TextDomain' ) ); + if ( wp_get_theme( $theme )->exists() ) { + $this->assertEquals( $theme, wp_get_theme( $theme )->get( 'TextDomain' ) ); + } } }