get rid of headers-already-sent-errors when running unit tests on cli
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@390 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
parent
de031f043f
commit
dfeeae38a9
4 changed files with 15 additions and 6 deletions
|
@ -11,10 +11,7 @@ if(isset($GLOBALS['debugMode'])) {
|
|||
}
|
||||
|
||||
// Determine the base URL as ROOT
|
||||
if (!isset($_SERVER['HTTP_HOST'])) {
|
||||
//not set in unit tests
|
||||
define('ROOT', 'http://localhost/');
|
||||
} else if (!isset($GLOBALS['root'])) {
|
||||
if (!isset($GLOBALS['root'])) {
|
||||
$pieces = explode('/', $_SERVER['SCRIPT_NAME']);
|
||||
|
||||
$rootTmp = '/';
|
||||
|
|
|
@ -45,7 +45,9 @@ T_bind_textdomain_codeset($domain, 'UTF-8');
|
|||
T_textdomain($domain);
|
||||
|
||||
// 4 // Session
|
||||
session_start();
|
||||
if (!defined('UNIT_TEST_MODE')) {
|
||||
session_start();
|
||||
}
|
||||
|
||||
// 5 // Create mandatory services and objects
|
||||
$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
|
||||
|
@ -57,5 +59,7 @@ $tplVars['currentUser'] = $currentUser;
|
|||
$tplVars['userservice'] = $userservice;
|
||||
|
||||
// 6 // Force UTF-8 behaviour for server (cannot be move into top.inc.php which is not included into every file)
|
||||
header('Content-Type: text/html; charset=utf-8');
|
||||
if (!defined('UNIT_TEST_MODE')) {
|
||||
header('Content-Type: text/html; charset=utf-8');
|
||||
}
|
||||
?>
|
||||
|
|
|
@ -15,6 +15,7 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
|
|||
define('PHPUnit_MAIN_METHOD', 'AllTests::main');
|
||||
}
|
||||
|
||||
require_once 'prepare.php';
|
||||
require_once 'PHPUnit/Framework/TestSuite.php';
|
||||
|
||||
class AllTests extends PHPUnit_Framework_TestSuite
|
||||
|
|
7
tests/prepare.php
Normal file
7
tests/prepare.php
Normal file
|
@ -0,0 +1,7 @@
|
|||
<?php
|
||||
/**
|
||||
* Prepare the application for unit testing
|
||||
*/
|
||||
$_SERVER['HTTP_HOST'] = 'http://localhost/';
|
||||
define('UNIT_TEST_MODE', true);
|
||||
?>
|
Loading…
Reference in a new issue