diff --git a/plugins/Contents/tests/ContentsTest.php b/plugins/Contents/tests/ContentsTest.php index 27b7860f2c98f4c85d346909d7e7ef365d4f9efb..e706267eadc83738cf3bf00c1094cd72fad32af6 100644 --- a/plugins/Contents/tests/ContentsTest.php +++ b/plugins/Contents/tests/ContentsTest.php @@ -8,7 +8,7 @@ namespace Piwik\Plugins\Contents\tests; use Piwik\Tests\IntegrationTestCase; -use Piwik\Plugins\Contents\tests\fixtures\TwoVisitsWithContents; +use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents; /** * Testing Contents diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php index 850374a460bd7e24627753da4f424e90b63bdb95..a826e13e36fc6f236fdd32005bd142116614c78c 100644 --- a/tests/PHPUnit/Fixtures/OmniFixture.php +++ b/tests/PHPUnit/Fixtures/OmniFixture.php @@ -41,6 +41,7 @@ class OmniFixture extends Fixture $classes = get_declared_classes(); sort($classes); + foreach ($classes as $className) { if (is_subclass_of($className, 'Piwik\\Tests\\Fixture') && !is_subclass_of($className, __CLASS__) @@ -49,10 +50,12 @@ class OmniFixture extends Fixture && $className != "Piwik\\Tests\\Fixtures\\UpdaterTestFixture" && $className != "Piwik\\Tests\\Fixtures\\UITestFixture" ) { + $klassReflect = new ReflectionClass($className); if (!strpos($klassReflect->getFilename(), "tests/PHPUnit/Fixtures") && $className != "CustomAlerts" && $className != "Piwik\\Plugins\\Insights\\tests\\Fixtures\\SomeVisitsDifferentPathsOnTwoDays" + && $className != "Piwik\\Plugins\\Contents\\tests\\Fixtures\\TwoVisitsWithContents" ) { continue; }