diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php index b41ed4bd705de2bf66d482c017b4d6170080a71c..510578cb76ddae119556f95b4330b3e9a7caa052 100644 --- a/plugins/TestRunner/Commands/TestsSetupFixture.php +++ b/plugins/TestRunner/Commands/TestsSetupFixture.php @@ -240,19 +240,6 @@ class TestsSetupFixture extends ConsoleCommand { 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'); if ($file) { if (is_file($file)) { diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index 2b3cdf01463c4a4faf41ba3b0fe2a4ae0362e4b5..5eed01f8060e99249c7f62095aaf1e405756e94a 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -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. -// 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(); function prepareServerVariables(Config $config)