Skip to content
Extraits de code Groupes Projets
Valider 8abbb26c rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Since autoloading is used now, do not manually include fixture files during...

Since autoloading is used now, do not manually include fixture files during tests. Fixes case when one plugin has issue in fixture class making it impossible to run tests (since the tests:run will just fail).
parent 2c3884cc
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -240,19 +240,6 @@ class TestsSetupFixture extends ConsoleCommand ...@@ -240,19 +240,6 @@ class TestsSetupFixture extends ConsoleCommand
{ {
require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php'; require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
$fixturesToLoad = array(
'/tests/PHPUnit/Fixtures/*.php',
'/tests/UI/Fixtures/*.php',
'/plugins/*/tests/Fixtures/*.php',
'/plugins/*/Test/Fixtures/*.php',
);
foreach($fixturesToLoad as $fixturePath) {
foreach (glob(PIWIK_INCLUDE_PATH . $fixturePath) as $file) {
require_once $file;
}
}
$file = $input->getOption('file'); $file = $input->getOption('file');
if ($file) { if ($file) {
if (is_file($file)) { if (is_file($file)) {
......
...@@ -60,18 +60,6 @@ function setupRootContainer() { ...@@ -60,18 +60,6 @@ function setupRootContainer() {
setupRootContainer(); // do it in a function so it doesn't appear in $_GLOBALS and so PHPUnit won't try to serialize it. setupRootContainer(); // do it in a function so it doesn't appear in $_GLOBALS and so PHPUnit won't try to serialize it.
// require test fixtures
$fixturesToLoad = array(
'/tests/UI/Fixtures/*.php',
'/plugins/*/tests/Fixtures/*.php',
'/plugins/*/Test/Fixtures/*.php',
);
foreach($fixturesToLoad as $fixturePath) {
foreach (glob(PIWIK_INCLUDE_PATH . $fixturePath) as $file) {
require_once $file;
}
}
Locale::setDefaultLocale(); Locale::setDefaultLocale();
function prepareServerVariables(Config $config) function prepareServerVariables(Config $config)
......
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