diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-07-31 13:28:52 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-07-31 13:28:52 +0400 |
| commit | d9d4598084aa51d95bf3eab0e961d3c27161cbb8 (patch) | |
| tree | b27b7d43975968c37354d0c4769f1dbf5f03622d /tests/PHPUnit | |
| parent | 9ba70e6ec502b051ca464ced9e96a09b30925a7c (diff) | |
Fixing post merge bugs
Diffstat (limited to 'tests/PHPUnit')
| -rw-r--r-- | tests/PHPUnit/TestingEnvironment.php | 7 | ||||
| -rw-r--r-- | tests/PHPUnit/proxy/archive.php | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php index b4d3107f86..6e015ab681 100644 --- a/tests/PHPUnit/TestingEnvironment.php +++ b/tests/PHPUnit/TestingEnvironment.php @@ -1,5 +1,9 @@ <?php +if (!defined('PIWIK_TEST_MODE')) { + define('PIWIK_TEST_MODE', true); +} + /** * Sets the test environment. */ @@ -7,9 +11,6 @@ class Piwik_TestingEnvironment { public static function addHooks() { - if (!defined('PIWIK_TEST_MODE')) { - define('PIWIK_TEST_MODE', true); - } Piwik_AddAction('Access.createAccessSingleton', function($access) { $access->setSuperUser(true); }); diff --git a/tests/PHPUnit/proxy/archive.php b/tests/PHPUnit/proxy/archive.php index 7960079c65..00a4269a04 100644 --- a/tests/PHPUnit/proxy/archive.php +++ b/tests/PHPUnit/proxy/archive.php @@ -1,4 +1,5 @@ <?php +define('PIWIK_MODE_ARCHIVE', true); // make sure the test environment is loaded require_once realpath(dirname(__FILE__)) . '/../../../core/EventDispatcher.php'; |