<!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>[615] wp-testcase: Always register /themes as a theme root when setting up theme directory tests in addition to the root we want to test.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://unit-tests.trac.wordpress.org/changeset/615">615</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-04-05 20:52:08 +0000 (Thu, 05 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always register /themes as a theme root when setting up theme directory tests in addition to the root we want to test.
Many WP functions assume that if only one theme root is registered, then that root must be /themes. To put it another way,
WordPress does not support only one theme root when that theme root is not /themes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_admin_includes_themephp">wp-testcase/test_admin_includes_theme.php</a></li>
<li><a href="#wptestcasetest_includes_themephp">wp-testcase/test_includes_theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_admin_includes_themephp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_admin_includes_theme.php (614 => 615)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_admin_includes_theme.php 2012-04-05 20:47:32 UTC (rev 614)
+++ wp-testcase/test_admin_includes_theme.php 2012-04-05 20:52:08 UTC (rev 615)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> $this->theme_root = realpath(DIR_TESTROOT.'/'.DIR_TESTDATA.'/themedir1');
</span><span class="cx">
</span><span class="cx"> $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
</span><del>- $GLOBALS['wp_theme_directories'] = array( $this->theme_root );
</del><ins>+ $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
</ins><span class="cx">
</span><span class="cx"> add_filter('theme_root', array(&$this, '_theme_root'));
</span><span class="cx"> add_filter( 'stylesheet_root', array(&$this, '_theme_root') );
</span><span class="lines">@@ -34,29 +34,25 @@
</span><span class="cx">
</span><span class="cx"> function test_page_templates() {
</span><span class="cx"> $this->knownWPBug(10959);
</span><del>- $themes = get_themes();
-
- $theme = $themes['Page Template Theme'];
</del><ins>+ $theme = get_theme('Page Template Theme');
</ins><span class="cx"> $this->assertFalse( empty($theme) );
</span><span class="cx">
</span><span class="cx"> switch_theme($theme['Template'], $theme['Stylesheet']);
</span><span class="cx">
</span><span class="cx"> $templates = get_page_templates();
</span><del>- $this->assertEquals(1 , count($templates));
</del><ins>+ $this->assertEquals(2, count($templates));
</ins><span class="cx"> $this->assertEquals("template-top-level.php", $templates['Top Level']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_page_templates_subdir() {
</span><span class="cx"> $this->knownWPBug(11216);
</span><del>- $themes = get_themes();
-
- $theme = $themes['Page Template Theme'];
</del><ins>+ $theme = get_theme('Page Template Theme');
</ins><span class="cx"> $this->assertFalse( empty($theme) );
</span><span class="cx">
</span><span class="cx"> switch_theme($theme['Template'], $theme['Stylesheet']);
</span><span class="cx">
</span><span class="cx"> $templates = get_page_templates();
</span><del>- $this->assertEquals(2 , count($templates));
</del><ins>+ $this->assertEquals(2, count($templates));
</ins><span class="cx"> $this->assertEquals("template-top-level.php", $templates['Top Level']);
</span><span class="cx"> $this->assertEquals("subdir/template-sub-dir.php", $templates['Sub Dir']);
</span><span class="cx"> }
</span></span></pre></div>
<a id="wptestcasetest_includes_themephp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_includes_theme.php (614 => 615)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_theme.php 2012-04-05 20:47:32 UTC (rev 614)
+++ wp-testcase/test_includes_theme.php 2012-04-05 20:52:08 UTC (rev 615)
</span><span class="lines">@@ -195,6 +195,7 @@
</span><span class="cx"> $theme = wp_get_theme();
</span><span class="cx"> $this->assertEquals( $style, (string) $theme );
</span><span class="cx"> $this->assertNotSame( false, $theme->errors() );
</span><ins>+ $this->assertFalse( $theme->exists() );
</ins><span class="cx">
</span><span class="cx"> // these return the bogus name - perhaps not ideal behaviour?
</span><span class="cx"> $this->assertEquals($template, get_template());
</span><span class="lines">@@ -211,8 +212,10 @@
</span><span class="cx"> $this->theme_root = realpath(DIR_TESTROOT.'/'.DIR_TESTDATA.'/themedir1');
</span><span class="cx">
</span><span class="cx"> $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
</span><del>- $GLOBALS['wp_theme_directories'] = array( $this->theme_root );
</del><span class="cx">
</span><ins>+ // /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 );
+
</ins><span class="cx"> add_filter('theme_root', array(&$this, '_theme_root'));
</span><span class="cx"> add_filter( 'stylesheet_root', array(&$this, '_theme_root') );
</span><span class="cx"> add_filter( 'template_root', array(&$this, '_theme_root') );
</span><span class="lines">@@ -237,7 +240,9 @@
</span><span class="cx">
</span><span class="cx"> function test_theme_default() {
</span><span class="cx"> $themes = get_themes();
</span><del>- $theme = $themes['WordPress Default'];
</del><ins>+ $theme = get_theme('WordPress Default');
+ $this->assertEquals( $themes['WordPress Default'], $theme );
+
</ins><span class="cx"> $this->assertFalse( empty($theme) );
</span><span class="cx">
</span><span class="cx"> #echo gen_tests_array('theme', $theme);
</span><span class="lines">@@ -261,9 +266,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_theme_sandbox() {
</span><del>- $themes = get_themes();
</del><ins>+ $theme = get_theme('Sandbox');
</ins><span class="cx">
</span><del>- $theme = $themes['Sandbox'];
</del><span class="cx"> $this->assertFalse( empty($theme) );
</span><span class="cx">
</span><span class="cx"> #echo gen_tests_array('theme', $theme);
</span><span class="lines">@@ -317,6 +321,13 @@
</span><span class="cx">
</span><span class="cx"> function test_theme_list() {
</span><span class="cx"> $themes = get_themes();
</span><ins>+
+ // Ignore themes in the default /themes directory.
+ foreach ( $themes as $theme_name => $theme ) {
+ if ( $theme->get_theme_root() != $this->theme_root )
+ unset( $themes[ $theme_name ] );
+ }
+
</ins><span class="cx"> $theme_names = array_keys($themes);
</span><span class="cx"> $expected = array(
</span><span class="cx"> 'WordPress Default',
</span><span class="lines">@@ -341,6 +352,11 @@
</span><span class="cx"> $this->assertEquals($expected, get_broken_themes() );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function test_wp_get_theme_with_non_default_theme_root() {
+ $this->assertFalse( wp_get_theme( 'sandbox', $this->theme_root )->errors() );
+ $this->assertFalse( wp_get_theme( 'sandbox' )->errors() );
+ }
+
</ins><span class="cx"> function test_page_templates() {
</span><span class="cx"> $themes = get_themes();
</span><span class="cx">
</span><span class="lines">@@ -391,7 +407,7 @@
</span><span class="cx"> $this->theme_root = realpath(DIR_TESTROOT.'/'.DIR_TESTDATA.'/wpcom-themes');
</span><span class="cx">
</span><span class="cx"> $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
</span><del>- $GLOBALS['wp_theme_directories'] = array( $this->theme_root );
</del><ins>+ $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
</ins><span class="cx">
</span><span class="cx"> add_filter('theme_root', array(&$this, '_theme_root'));
</span><span class="cx">
</span><span class="lines">@@ -412,8 +428,16 @@
</span><span class="cx"> return $this->theme_root;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function _filter_out_themes_not_in_root( &$themes ) {
+ foreach ( $themes as $key => $theme ) {
+ if ( $theme->get_theme_root() != $this->theme_root )
+ unset( $themes[ $key ] );
+ }
+ }
+
</ins><span class="cx"> function test_theme_list() {
</span><span class="cx"> $themes = get_themes();
</span><ins>+ $this->_filter_out_themes_not_in_root( $themes );
</ins><span class="cx"> $theme_names = array_keys( $themes );
</span><span class="cx"> $this->assertEquals(87, count( $theme_names ) );
</span><span class="cx"> $length = strlen( serialize( $themes ) );
</span><span class="lines">@@ -432,6 +456,7 @@
</span><span class="cx"> function test_smaller_storage() {
</span><span class="cx"> $this->knownWPBug(11214);
</span><span class="cx"> $themes = get_themes();
</span><ins>+ $this->_filter_out_themes_not_in_root( $themes );
</ins><span class="cx"> $theme_names = array_keys($themes);
</span><span class="cx"> $this->assertEquals(87, count($theme_names));
</span><span class="cx"> $this->assertLessThanOrEqual(136342, strlen(serialize($themes)));
</span></span></pre>
</div>
</div>
</body>
</html>