sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Themes: Account for uppercase chars when managing themes.

Browse Source 
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 #37924.
 


git-svn-id: https://develop.svn.wordpress.org/trunk@38710 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Konstantin Obenland 2016-10-03 18:12:57 +00:00
parent 395823c9cd
commit ab087dadfc
4 changed files with 185 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-admin/includes/ajax-actions.php
View File

@ -3405,7 +3405,7 @@ function wp_ajax_update_theme() {
) );
}
$stylesheet = sanitize_key( wp_unslash( $_POST['slug'] ) );
$stylesheet = preg_replace( '/[^A-z0-9_\-]/', '', wp_unslash( $_POST['slug'] ) );
$status = array(
'update' => 'theme',
'slug' => $stylesheet,
@ -3490,7 +3490,7 @@ function wp_ajax_delete_theme() {
) );
}
$stylesheet = sanitize_key( wp_unslash( $_POST['slug'] ) );
$stylesheet = preg_replace( '/[^A-z0-9_\-]/', '', wp_unslash( $_POST['slug'] ) );
$status = array(
'delete' => 'theme',
'slug' => $stylesheet,

5
tests/phpunit/data/themedir1/camelCase/index.php Normal file
View File

@ -0,0 +1,5 @@
<?php
// dummy theme
echo dirname(__FILE__).'/'.basename(__FILE__);

11
tests/phpunit/data/themedir1/camelCase/style.css Normal file
View File

@ -0,0 +1,11 @@
/*
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.
*/

167
tests/phpunit/tests/ajax/ManageThemes.php Normal file
View File

@ -0,0 +1,167 @@
<?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 );
}
}