Skip to content
Extraits de code Groupes Projets
Valider a195b37f rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

refs #6635 if user has not configured test section but Piwik is installed then...

refs #6635 if user has not configured test section but Piwik is installed then we can configure most parts for the user
parent 9f30ddf2
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -56,12 +56,30 @@ foreach($fixturesToLoad as $fixturePath) { ...@@ -56,12 +56,30 @@ foreach($fixturesToLoad as $fixturePath) {
} }
} }
\Piwik\Config::getInstance()->init(); function prepareServerVariables()
$testConfig = \Piwik\Config::getInstance()->tests; {
\Piwik\Config::getInstance()->init();
$testConfig = \Piwik\Config::getInstance()->tests;
if ('@REQUEST_URI@' === $testConfig['request_uri']) {
// config not done yet, if Piwik is installed we can automatically configure request_uri and http_host
$url = \Piwik\SettingsPiwik::getPiwikUrl();
if (!empty($url)) {
$parsedUrl = parse_url($url);
$testConfig['request_uri'] = $parsedUrl['path'];
$testConfig['http_host'] = $parsedUrl['host'];
\Piwik\Config::getInstance()->tests = $testConfig;
\Piwik\Config::getInstance()->forceSave();
}
}
$_SERVER['HTTP_HOST'] = $testConfig['http_host'];
$_SERVER['REQUEST_URI'] = $testConfig['request_uri'];
$_SERVER['REMOTE_ADDR'] = $testConfig['remote_addr'];
}
$_SERVER['HTTP_HOST'] = $testConfig['http_host']; prepareServerVariables();
$_SERVER['REQUEST_URI'] = $testConfig['request_uri'];
$_SERVER['REMOTE_ADDR'] = $testConfig['remote_addr'];
// General requirement checks & help: a webserver must be running for tests to work if not running UnitTests! // General requirement checks & help: a webserver must be running for tests to work if not running UnitTests!
if (empty($_SERVER['argv']) || !in_array('UnitTests', $_SERVER['argv'])) { if (empty($_SERVER['argv']) || !in_array('UnitTests', $_SERVER['argv'])) {
...@@ -77,11 +95,13 @@ function checkPiwikSetupForTests() ...@@ -77,11 +95,13 @@ function checkPiwikSetupForTests()
1) Install webserver on localhost, eg. apache 1) Install webserver on localhost, eg. apache
2) Make these Piwik files available on the webserver, at eg. http://localhost/dev/piwik/ 2) Make these Piwik files available on the webserver, at eg. http://localhost/dev/piwik/
3) Install Piwik by going through the installation process 3) Install Piwik by going through the installation process
4) Copy phpunit.xml.dist to phpunit.xml 4) Configure tests section if needed in config/config.ini.php:
5) Edit in phpunit.xml the @REQUEST_URI@ and replace with the webserver path to Piwik, eg. '/dev/piwik/' [tests]
http_host = \"localhost\"
request_uri = \"@REQUEST_URI@\"
remote_addr = \"127.0.0.1\"
Try again. Try again.";
-> If you still get this message, you can work around it by specifying Host + Request_Uri at the top of this file tests/PHPUnit/bootstrap.php. <-";
exit(1); exit(1);
} }
$baseUrl = \Piwik\Tests\Framework\Fixture::getRootUrl(); $baseUrl = \Piwik\Tests\Framework\Fixture::getRootUrl();
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter