<!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>[Tests][937] trunk/bootstrap.php: Push ajax group and multisite configuration notices to the top of the script, rather than as notices at the bottom.</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/937">937</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-07-26 21:19:52 +0000 (Thu, 26 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Push ajax group and multisite configuration notices to the top of the script, rather than as notices at the bottom. fixes <a href="http://unit-tests.trac.wordpress.org/ticket/112">#112</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbootstrapphp">trunk/bootstrap.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbootstrapphp"></a>
<div class="modfile"><h4>Modified: trunk/bootstrap.php (936 => 937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bootstrap.php 2012-07-26 20:19:03 UTC (rev 936)
+++ trunk/bootstrap.php 2012-07-26 21:19:52 UTC (rev 937)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/bin/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
</span><span class="cx">
</span><span class="cx"> if ( $multisite ) {
</span><ins>+ echo "Running as multisite…" . PHP_EOL;
</ins><span class="cx"> define( 'MULTISITE', true );
</span><span class="cx"> define( 'SUBDOMAIN_INSTALL', false );
</span><span class="cx"> define( 'DOMAIN_CURRENT_SITE', WP_TESTS_DOMAIN );
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx"> define( 'BLOG_ID_CURRENT_SITE', 1 );
</span><span class="cx"> $GLOBALS['base'] = '/';
</span><span class="cx"> } else {
</span><del>- register_shutdown_function( array( 'WP_PHPUnit_TextUI_Command', 'multisiteWasNotRun' ) );
</del><ins>+ echo "Running as single site… To run multisite, use -c multisite." . PHP_EOL;
</ins><span class="cx"> }
</span><span class="cx"> unset( $multisite );
</span><span class="cx">
</span><span class="lines">@@ -104,31 +105,24 @@
</span><span class="cx"> 'd:c:hv',
</span><span class="cx"> array_keys( $this->longOptions )
</span><span class="cx"> );
</span><del>- if ( empty( $options[0] ) ) {
- register_shutdown_function( array( __CLASS__, 'ajaxTestsWereNotRun' ) );
- return;
- }
</del><ins>+ $ajax_message = true;
</ins><span class="cx"> foreach ( $options[0] as $option ) {
</span><del>- if ( $option[0] !== '--group' )
- continue;
- $groups = explode( ',', $option[1] );
- foreach ( $groups as $group ) {
- if ( is_numeric( $group ) || preg_match( '/^(UT|Plugin)\d+$/', $group ) )
- WP_UnitTestCase::forceTicket( $group );
</del><ins>+ switch ( $option[0] ) {
+ case '--exclude-group' :
+ $ajax_message = false;
+ continue 2;
+ case '--group' :
+ $groups = explode( ',', $option[1] );
+ foreach ( $groups as $group ) {
+ if ( is_numeric( $group ) || preg_match( '/^(UT|Plugin)\d+$/', $group ) )
+ WP_UnitTestCase::forceTicket( $group );
+ }
+ $ajax_message = ! in_array( 'ajax', $groups );
+ continue 2;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ if ( $ajax_message )
+ echo "Not running ajax tests… To execute these, use --group ajax." . PHP_EOL;
</ins><span class="cx"> }
</span><del>-
- static function ajaxTestsWereNotRun() {
- echo PHP_EOL . "\x1b[0m\x1b[30;43m\x1b[2K";
- echo 'INFO: By default, Ajax tests are not run. To execute these, use `phpunit --group ajax`' . PHP_EOL;
- echo "\x1b[0m\x1b[2K";
- }
-
- static function multisiteWasNotRun() {
- echo PHP_EOL . "\x1b[0m\x1b[30;43m\x1b[2K";
- echo 'INFO: To run the tests using multisite, use `phpunit -c multisite`' . PHP_EOL;
- echo "\x1b[0m\x1b[2K";
- }
</del><span class="cx"> }
</span><span class="cx"> new WP_PHPUnit_TextUI_Command( $_SERVER['argv'] );
</span></span></pre>
</div>
</div>
</body>
</html>