refs #4996 do not igonre the contents fixture in ui tests

matomo-org · Sep 18, 2014 · f328ff5 · f328ff5
1 parent 14a920f
commit f328ff5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -41,6 +41,7 @@ public function __construct()
 
         $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 @@ public function __construct()
                 && $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;
                 }