<!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>[38710] trunk: Themes: Account for uppercase chars when managing themes.</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/38710">38710</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/38710","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-10-03 18:12:57 +0000 (Mon, 03 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'>Themes: Account for uppercase chars when managing themes.
Fixes a bug where the UI wasn't updated after deleting/updating a theme.
Also introduces unit tests for theme management ajax handlers. For now they're
focused on `wp_ajax_update_theme()` but they can include tests for other
handlers as well.
Props chrisjean for initial patch.
Fixes <a href="https://core.trac.wordpress.org/ticket/37924">#37924</a>.
</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/data/themedir1/camelCase/</li>
<li><a href="#trunktestsphpunitdatathemedir1camelCaseindexphp">trunk/tests/phpunit/data/themedir1/camelCase/index.php</a></li>
<li><a href="#trunktestsphpunitdatathemedir1camelCasestylecss">trunk/tests/phpunit/data/themedir1/camelCase/style.css</a></li>
<li><a href="#trunktestsphpunittestsajaxManageThemesphp">trunk/tests/phpunit/tests/ajax/ManageThemes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2016-10-03 16:27:55 UTC (rev 38709)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2016-10-03 18:12:57 UTC (rev 38710)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3405,7 +3405,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stylesheet = sanitize_key( wp_unslash( $_POST['slug'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stylesheet = preg_replace( '/[^A-z0-9_\-]/', '', wp_unslash( $_POST['slug'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'update' => 'theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $stylesheet,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3490,7 +3490,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stylesheet = sanitize_key( wp_unslash( $_POST['slug'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stylesheet = preg_replace( '/[^A-z0-9_\-]/', '', wp_unslash( $_POST['slug'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'delete' => 'theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $stylesheet,
</span></span></pre></div>
<a id="trunktestsphpunitdatathemedir1camelCaseindexphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/camelCase/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/camelCase/index.php (rev 0)
+++ trunk/tests/phpunit/data/themedir1/camelCase/index.php 2016-10-03 18:12:57 UTC (rev 38710)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,5 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+// dummy theme
+
+echo dirname(__FILE__).'/'.basename(__FILE__);
</ins></span></pre></div>
<a id="trunktestsphpunitdatathemedir1camelCasestylecss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/camelCase/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/camelCase/style.css (rev 0)
+++ trunk/tests/phpunit/data/themedir1/camelCase/style.css 2016-10-03 18:12:57 UTC (rev 38710)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,11 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
+Theme Name: camelCase
+Theme URI: http://example.org/
+Description: This theme has a camelCase slug.
+Version: 1.0
+Author: Minnie Bannister
+Author URI: http://example.com/
+
+This is just a stub to test the loading of the above metadata.
+
+*/
</ins></span></pre></div>
<a id="trunktestsphpunittestsajaxManageThemesphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/ajax/ManageThemes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/ManageThemes.php (rev 0)
+++ trunk/tests/phpunit/tests/ajax/ManageThemes.php 2016-10-03 18:12:57 UTC (rev 38710)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,167 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Admin ajax functions to be tested
+ */
+require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+
+/**
+ * Testing Ajax handler for instlaling, updating, and deleting themes.
+ *
+ * @group ajax
+ */
+class Tests_Ajax_Manage_Themes extends WP_Ajax_UnitTestCase {
+ private $orig_theme_dir;
+ private $theme_root;
+
+ function setUp() {
+ parent::setUp();
+
+ $this->theme_root = DIR_TESTDATA . '/themedir1';
+ $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
+
+ // /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
+ $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
+
+ add_filter( 'theme_root', array( $this, 'filter_theme_root' ) );
+ add_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
+ add_filter( 'template_root', array( $this, 'filter_theme_root' ) );
+
+ wp_clean_themes_cache();
+ unset( $GLOBALS['wp_themes'] );
+ }
+
+ function tearDown() {
+ $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
+ remove_filter( 'theme_root', array( $this, 'filter_theme_root' ) );
+ remove_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
+ remove_filter( 'template_root', array( $this, 'filter_theme_root' ) );
+ wp_clean_themes_cache();
+ unset( $GLOBALS['wp_themes'] );
+
+ parent::tearDown();
+ }
+
+ /**
+ * Replace the normal theme root dir with our pre-made test dir.
+ */
+ public function filter_theme_root() {
+ return $this->theme_root;
+ }
+
+ public function test_missing_slug() {
+ $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
+
+ // Make the request.
+ try {
+ $this->_handleAjax( 'update-theme' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ // Get the response.
+ $response = json_decode( $this->_last_response, true );
+
+ $expected = array(
+ 'success' => false,
+ 'data' => array(
+ 'slug' => '',
+ 'errorCode' => 'no_theme_specified',
+ 'errorMessage' => 'No theme specified.',
+ ),
+ );
+
+ $this->assertEqualSets( $expected, $response );
+ }
+
+ public function test_missing_capability() {
+ $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
+ $_POST['slug'] = 'foo';
+
+ // Make the request.
+ try {
+ $this->_handleAjax( 'update-theme' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ // Get the response.
+ $response = json_decode( $this->_last_response, true );
+
+ $expected = array(
+ 'success' => false,
+ 'data' => array(
+ 'update' => 'theme',
+ 'slug' => 'foo',
+ 'errorMessage' => 'Sorry, you are not allowed to update themes for this site.',
+ 'newVersion' => '',
+ ),
+ );
+
+ $this->assertEqualSets( $expected, $response );
+ }
+
+ public function test_update_theme() {
+ $this->_setRole( 'administrator' );
+
+ $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
+ $_POST['slug'] = 'twentyten';
+
+ // Make the request.
+ try {
+
+ // Prevent wp_update_themes() from running.
+ wp_installing( true );
+ $this->_handleAjax( 'update-theme' );
+ wp_installing( false );
+
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ // Get the response.
+ $response = json_decode( $this->_last_response, true );
+
+ $expected = array(
+ 'success' => false,
+ 'data' => array(
+ 'update' => 'theme',
+ 'slug' => 'twentyten',
+ 'errorMessage' => 'The theme is at the latest version.',
+ 'newVersion' => '',
+ 'debug' => array( 'The theme is at the latest version.' ),
+ ),
+ );
+
+ $this->assertEqualSets( $expected, $response );
+ }
+
+ function test_uppercase_theme_slug() {
+ $this->_setRole( 'administrator' );
+
+ $_POST['_ajax_nonce'] = wp_create_nonce( 'updates' );
+ $_POST['slug'] = 'camelCase';
+
+ // Make the request.
+ try {
+ $this->_handleAjax( 'update-theme' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ // Get the response.
+ $response = json_decode( $this->_last_response, true );
+
+ $expected = array(
+ 'success' => false,
+ 'data' => array(
+ 'update' => 'theme',
+ 'slug' => 'camelCase',
+ 'newVersion' => '',
+ 'errorMessage' => 'The theme is at the latest version.',
+ 'debug' => array( 'The theme is at the latest version.' ),
+ ),
+ );
+
+ $this->assertEqualSets( $expected, $response );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>