<!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>[GlotPress][843] trunk/t: Start using a phpunit.xml.dist file and better error message when not having a unittests-config.php file.</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="https://glotpress.trac.wordpress.org/changeset/843">843</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2014-02-23 17:10:21 +0000 (Sun, 23 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start using a phpunit.xml.dist file and better error message when not having a unittests-config.php file. See <a href="http://glotpress.trac.wordpress.org/ticket/285">#285</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktallphp">trunk/t/all.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktlibbootstrapphp">trunk/t/lib/bootstrap.php</a></li>
<li><a href="#trunktphpunitxmldist">trunk/t/phpunit.xml.dist</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktinitphp">trunk/t/init.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktallphp"></a>
<div class="modfile"><h4>Modified: trunk/t/all.php (842 => 843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/all.php 2014-02-23 17:03:51 UTC (rev 842)
+++ trunk/t/all.php 2014-02-23 17:10:21 UTC (rev 843)
</span><span class="lines">@@ -1,8 +1,5 @@
</span><span class="cx"> <?php
</span><del>-require_once 'PHPUnit/Autoload.php';
</del><span class="cx">
</span><del>-require 'init.php';
-
</del><span class="cx"> $tests_dir = dirname( __FILE__ ) . '/tests';
</span><span class="cx"> $old_cwd = getcwd();
</span><span class="cx"> chdir( $tests_dir );
</span></span></pre></div>
<a id="trunktinitphp"></a>
<div class="delfile"><h4>Deleted: trunk/t/init.php (842 => 843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/init.php 2014-02-23 17:03:51 UTC (rev 842)
+++ trunk/t/init.php 2014-02-23 17:10:21 UTC (rev 843)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<?php
-
-define( 'GP_CONFIG_FILE', dirname( __FILE__ ) . '/unittests-config.php' );
-
-if ( !isset( $_SERVER['SERVER_PROTOCOL'] ) ) {
- $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-}
-
-require_once dirname( __FILE__ ) . '/../gp-load.php';
-
-require dirname( __FILE__ ) . '/lib/testcase.php';
-require dirname( __FILE__ ) . '/lib/testcase-route.php';
-require dirname( __FILE__ ) . '/lib/testcase-request.php';
</del></span></pre></div>
<a id="trunktlibbootstrapphpfromrev841trunktinitphp"></a>
<div class="copfile"><h4>Copied: trunk/t/lib/bootstrap.php (from rev 841, trunk/t/init.php) (0 => 843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/lib/bootstrap.php (rev 0)
+++ trunk/t/lib/bootstrap.php 2014-02-23 17:10:21 UTC (rev 843)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<?php
+
+$config_file_path = dirname( dirname( __FILE__ ) ) . '/unittests-config.php';
+
+if ( ! is_readable( $config_file_path ) ) {
+ die( "ERROR: unittests-config.php is missing! Please use unittests-config-sample.php to create a config file.\n" );
+}
+
+define( 'GP_CONFIG_FILE', $config_file_path );
+
+if ( ! isset( $_SERVER['SERVER_PROTOCOL'] ) ) {
+ $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+}
+
+// Load GlotPress
+require_once dirname( dirname( dirname( __FILE__ ) ) ) . '/gp-load.php';
+
+require dirname( __FILE__ ) . '/testcase.php';
+require dirname( __FILE__ ) . '/testcase-route.php';
+require dirname( __FILE__ ) . '/testcase-request.php';
</ins></span></pre></div>
<a id="trunktphpunitxmldist"></a>
<div class="addfile"><h4>Added: trunk/t/phpunit.xml.dist (0 => 843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/t/phpunit.xml.dist (rev 0)
+++ trunk/t/phpunit.xml.dist 2014-02-23 17:10:21 UTC (rev 843)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="lib/bootstrap.php" backupGlobals="false" colors="true">
+ <testsuites>
+ <!-- Default test suite to run all tests -->
+ <testsuite>
+ <directory suffix=".php">tests</directory>
+ </testsuite>
+ </testsuites>
+ <logging>
+ <log type="coverage-clover" target="build/logs/clover.xml"/>
+ </logging>
+</phpunit>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>