diff options
| author | diosmosis <benaka@piwik.pro> | 2015-03-12 12:26:38 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-03-12 12:26:38 +0300 |
| commit | 54bd3f0f18b3ba9edde0823d7f06e0769e5abad7 (patch) | |
| tree | 4cc4c26ff9558a8cbc0ccf6afb2cd7498a1a1996 /tests/PHPUnit/Framework/TestCase | |
| parent | 5197b1cd4ddd21e7c2ab4cfe2906dff92ac35734 (diff) | |
| parent | 484935ce69c19e94d4b2a95aca33e75b0802abbe (diff) | |
Merge branch 'master' into 7181_isolated_archive_purging
Conflicts:
plugins/SitesManager/SitesManager.php
Diffstat (limited to 'tests/PHPUnit/Framework/TestCase')
| -rwxr-xr-x | tests/PHPUnit/Framework/TestCase/UnitTestCase.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php index f08eaa1953..8e07c39cc7 100755 --- a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php +++ b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php @@ -18,7 +18,7 @@ use Piwik\Tests\Framework\Mock\File; */ abstract class UnitTestCase extends \PHPUnit_Framework_TestCase { - public function setup() + public function setUp() { parent::setUp(); File::reset(); |