From f328ff521e8ce0e80523f1cb6578fec89227ffe5 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Thu, 18 Sep 2014 13:45:38 +0200
Subject: [PATCH] refs #4996 do not igonre the contents fixture in ui tests
---
plugins/Contents/tests/ContentsTest.php | 2 +-
tests/PHPUnit/Fixtures/OmniFixture.php | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/plugins/Contents/tests/ContentsTest.php b/plugins/Contents/tests/ContentsTest.php
index 27b7860f2c..e706267ead 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 850374a460..a826e13e36 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;
}
--
GitLab