<!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>[BuddyPress][7028] trunk/tests: Add support for multisite.xml unit tests</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7028">7028</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-09 01:05:45 +0000 (Thu, 09 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for multisite.xml unit tests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsincludesinstallphp">trunk/tests/includes/install.php</a></li>
<li><a href="#trunktestsincludestestcasephp">trunk/tests/includes/testcase.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsmultisitexml">trunk/tests/multisite.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsincludesinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/includes/install.php (7027 => 7028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/includes/install.php 2013-05-08 21:01:04 UTC (rev 7027)
+++ trunk/tests/includes/install.php 2013-05-09 01:05:45 UTC (rev 7028)
</span><span class="lines">@@ -37,18 +37,34 @@
</span><span class="cx"> define( 'BP_TESTS_DB_VERSION_FILE', ABSPATH . '.bp-tests-version' );
</span><span class="cx">
</span><span class="cx"> // Check if BuddyPress has already been installed
</span><del>-$db_version = bp_get_db_version_raw();
</del><ins>+$db_version = buddypress()->db_version;
+$hash = $db_version . ' ' . (int) $multisite . ' ' . sha1_file( $config_file_path );
</ins><span class="cx">
</span><span class="cx"> if ( $db_version && file_exists( BP_TESTS_DB_VERSION_FILE ) ) {
</span><del>- $file_version = file_get_contents( BP_TESTS_DB_VERSION_FILE );
</del><ins>+ $version_file = file_get_contents( BP_TESTS_DB_VERSION_FILE );
</ins><span class="cx">
</span><del>- if ( $db_version == (int) $file_version )
</del><ins>+ if ( $hash === $version_file ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo "Installing BuddyPress...\n";
</span><span class="cx">
</span><ins>+// Make sure that BP has been cleaned from all blogs before reinstalling
+$blogs = is_multisite() ? $wpdb->get_col( "SELECT blog_id FROM {$wpdb->blogs}" ) : array( 1 );
+foreach ( $blogs as $blog ) {
+ if ( is_multisite() ) {
+ switch_to_blog();
+ }
+
+ $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '%bp%'" );
+
+ if ( is_multisite() ) {
+ restore_current_blog();
+ }
+}
+
</ins><span class="cx"> // Install BuddyPress
</span><span class="cx"> bp_version_updater();
</span><span class="cx">
</span><del>-file_put_contents( BP_TESTS_DB_VERSION_FILE, bp_get_db_version_raw() );
</del><ins>+file_put_contents( BP_TESTS_DB_VERSION_FILE, $hash );
</ins></span></pre></div>
<a id="trunktestsincludestestcasephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/includes/testcase.php (7027 => 7028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/includes/testcase.php 2013-05-08 21:01:04 UTC (rev 7027)
+++ trunk/tests/includes/testcase.php 2013-05-09 01:05:45 UTC (rev 7028)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> function go_to( $url ) {
</span><span class="cx"> // Set this for bp_core_set_uri_globals()
</span><del>- $GLOBALS['_SERVER']['REQUEST_URI'] = $url = str_replace( network_home_url(), '', $url );
</del><ins>+ $GLOBALS['_SERVER']['REQUEST_URI'] = $url = str_replace( untrailingslashit( network_home_url() ), '', $url );
</ins><span class="cx">
</span><span class="cx"> // note: the WP and WP_Query classes like to silently fetch parameters
</span><span class="cx"> // from all over the place (globals, GET, etc), which makes it tricky
</span></span></pre></div>
<a id="trunktestsmultisitexml"></a>
<div class="addfile"><h4>Added: trunk/tests/multisite.xml (0 => 7028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/multisite.xml (rev 0)
+++ trunk/tests/multisite.xml 2013-05-09 01:05:45 UTC (rev 7028)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<phpunit
+ bootstrap="bootstrap.php"
+ backupGlobals="false"
+ colors="true"
+ convertErrorsToExceptions="true"
+ convertNoticesToExceptions="true"
+ convertWarningsToExceptions="true"
+ >
+ <php>
+ <const name="WP_TESTS_MULTISITE" value="1" />
+ </php>
+ <testsuites>
+ <testsuite>
+ <directory suffix=".php">./testcases/</directory>
+ </testsuite>
+ </testsuites>
+</phpunit>
</ins></span></pre>
</div>
</div>
</body>
</html>