diff options
author | diosmosis <benaka@piwik.pro> | 2014-09-15 17:15:28 +0400 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2014-09-15 17:15:28 +0400 |
commit | e371d7c6a01464d476d5eb0c027fbeae83edcc20 (patch) | |
tree | 559358007685dd54d942d851a6a864bc47a34647 /tests | |
parent | 1acf150cb6cd25675a8db418f70b856eee6afe77 (diff) |
Fix OmniFixture.php for use w/ namespaced test classes & regenerate OmniFixture dump for UI tests.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/PHPUnit/Fixtures/OmniFixture.php | 6 | ||||
-rw-r--r-- | tests/resources/OmniFixture-dump.sql.gz | bin | 624382 -> 657053 bytes |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php index 1695dbe004..850374a460 100644 --- a/tests/PHPUnit/Fixtures/OmniFixture.php +++ b/tests/PHPUnit/Fixtures/OmniFixture.php @@ -42,10 +42,10 @@ class OmniFixture extends Fixture $classes = get_declared_classes(); sort($classes); foreach ($classes as $className) { - if (is_subclass_of($className, 'Piwik\Tests\Fixture') + if (is_subclass_of($className, 'Piwik\\Tests\\Fixture') && !is_subclass_of($className, __CLASS__) && $className != __CLASS__ - && $className != "Piwik_Test_Fixture_SqlDump" + && $className != "Piwik\\Tests\\Fixtures\\SqlDump" && $className != "Piwik\\Tests\\Fixtures\\UpdaterTestFixture" && $className != "Piwik\\Tests\\Fixtures\\UITestFixture" ) { @@ -70,7 +70,7 @@ class OmniFixture extends Fixture } } - $this->now = $this->fixtures['Piwik\Tests\Fixtures\ManySitesImportedLogsWithXssAttempts']->now; + $this->now = $this->fixtures['Piwik\\Tests\\Fixtures\\ManySitesImportedLogsWithXssAttempts']->now; // make sure ManySitesImportedLogsWithXssAttempts is the first fixture $fixture = $this->fixtures['Piwik\\Tests\\Fixtures\\ManySitesImportedLogsWithXssAttempts']; diff --git a/tests/resources/OmniFixture-dump.sql.gz b/tests/resources/OmniFixture-dump.sql.gz Binary files differindex 9c8dc1b75a..5fed52684e 100644 --- a/tests/resources/OmniFixture-dump.sql.gz +++ b/tests/resources/OmniFixture-dump.sql.gz |