<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38830] trunk/tests/phpunit/tests/customize/manager.php: Customize: Fix unit tests when `twentyfifteen` is `WP_DEFAULT_THEME` instead of `twentysixteen`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38830">38830</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38830","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-19 19:38:27 +0000 (Wed, 19 Oct 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customize: Fix unit tests when `twentyfifteen` is `WP_DEFAULT_THEME` instead of `twentysixteen`.
Use an inactive core theme for previewing theme switch instead of assuming `twentysixteen` is installed and active and `twentyfifteen` is not.
See <a href="https://core.trac.wordpress.org/ticket/30937">#30937</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2016-10-19 18:14:21 UTC (rev 38829)
+++ trunk/tests/phpunit/tests/customize/manager.php 2016-10-19 19:38:27 UTC (rev 38830)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,6 +71,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get a core theme that is not the same as the current theme.
+ *
+ * @throws Exception If an inactive core Twenty* theme cannot be found.
+ * @return string Theme slug (stylesheet).
+ */
+ function get_inactive_core_theme() {
+ $stylesheet = get_stylesheet();
+ foreach ( wp_get_themes() as $theme ) {
+ if ( $theme->stylesheet !== $stylesheet && 0 === strpos( $theme->stylesheet, 'twenty' ) ) {
+ return $theme->stylesheet;
+ }
+ }
+ throw new Exception( 'Unable to find inactive twenty* theme.' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Instantiate class, set global $wp_customize, and return instance.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Customize_Manager
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -347,6 +363,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers WP_Customize_Manager::add_state_query_params()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_add_state_query_params() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_theme = $this->get_inactive_core_theme();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px"> $messenger_channel = 'preview-0';
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = new WP_Customize_Manager( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = new WP_Customize_Manager( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'changeset_uuid' => $uuid,
</span><span class="cx" style="display: block; padding: 0 10px"> 'messenger_channel' => null,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme' => 'twentyfifteen',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme' => $preview_theme,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = $wp_customize->add_state_query_params( home_url( '/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_url = wp_parse_url( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,13 +393,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'customize_changeset_uuid', $query_params );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'customize_theme', $query_params );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $uuid, $query_params['customize_changeset_uuid'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'twentyfifteen', $query_params['customize_theme'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $preview_theme, $query_params['customize_theme'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize = new WP_Customize_Manager( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'changeset_uuid' => $uuid,
</span><span class="cx" style="display: block; padding: 0 10px"> 'messenger_channel' => null,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme' => 'twentyfifteen',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme' => $preview_theme,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = $wp_customize->add_state_query_params( 'http://not-allowed.example.com/?q=1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_url = wp_parse_url( $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,8 +628,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_save_changeset_post_with_theme_activation() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$admin_user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_theme = $this->get_inactive_core_theme();
</ins><span class="cx" style="display: block; padding: 0 10px"> $stashed_theme_mods = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyfifteen' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_theme => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'background_color' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => '#123456',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,18 +640,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $uuid = wp_generate_uuid4();
</span><span class="cx" style="display: block; padding: 0 10px"> $manager = new WP_Customize_Manager( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'changeset_uuid' => $uuid,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme' => 'twentyfifteen',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme' => $preview_theme,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->register_controls();
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_customize'] = $manager;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $manager->set_post_value( 'blogname', 'Hello 2015' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $manager->set_post_value( 'blogname', 'Hello Preview Theme' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_values = $manager->unsanitized_post_values();
</span><span class="cx" style="display: block; padding: 0 10px"> $manager->save_changeset_post( array( 'status' => 'publish' ) ); // Activate.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '#123456', $post_values['background_color'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'twentyfifteen', get_stylesheet() );
- $this->assertEquals( 'Hello 2015', get_option( 'blogname' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( $preview_theme, get_stylesheet() );
+ $this->assertEquals( 'Hello Preview Theme', get_option( 'blogname' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -749,8 +768,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_unsanitized_post_values_with_changeset_and_stashed_theme_mods() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$admin_user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_theme = $this->get_inactive_core_theme();
</ins><span class="cx" style="display: block; padding: 0 10px"> $stashed_theme_mods = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'twentyfifteen' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_theme => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'background_color' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => '#000000',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -827,7 +847,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Test unstashing theme mods.
</span><span class="cx" style="display: block; padding: 0 10px"> $manager = new WP_Customize_Manager( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'changeset_uuid' => $uuid,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'theme' => 'twentyfifteen',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme' => $preview_theme,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $manager->is_theme_active() );
</span><span class="cx" style="display: block; padding: 0 10px"> $values = $manager->unsanitized_post_values( array( 'exclude_post_data' => true, 'exclude_changeset' => true ) );
</span></span></pre>
</div>
</div>
</body>
</html>