Allow users of segment selector to manually change the selected segme…

…nt and use reflection to filter fixtures used by OmniFixture.
d19dotca · Mar 25, 2014 · c626d8c · c626d8c
1 parent c25f37c
commit c626d8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -1195,6 +1195,10 @@ $(document).ready(function() {
             return this.impl.getSegment();
         },
 
+        setSegment: function (segment) {
+            return this.impl.setSegment(segment);
+        },
+
         rebuild: function () {
             this.impl.setAvailableSegments(this.props.availableSegments);
             this.impl.initHtml();

diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -9,6 +9,7 @@
 
 use Piwik\Date;
 use Piwik\Tracker\Visit;
+use \ReflectionClass;
 
 /**
  * This fixture is the combination of every other fixture defined by Piwik. Should be used
@@ -42,6 +43,11 @@ public function __construct()
                 && $className != "Piwik_Test_Fixture_SqlDump"
                 && $className != "Piwik\\Tests\\Fixtures\\UpdaterTestFixture"
             ) {
+                $klassReflect = new ReflectionClass($className);
+                if (strpos($klassReflect->getFilename(), "tests/PHPUnit/UI")) {
+                    continue;
+                }
+
                 $fixture = new $className();
                 if (!property_exists($fixture, 'dateTime')) {
                     continue;