diff options
author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-10-03 16:57:32 +0400 |
---|---|---|
committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-10-03 16:57:32 +0400 |
commit | 690553ba0eb2cab12d90cbf183e6cfd75d807f15 (patch) | |
tree | be9ccecb847554f72a1352d88259cb2d6a32aa62 /tests | |
parent | ec6de8cc85d13e4f9ccb0ba251befc41af0f38fd (diff) |
Fixing UI tests.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/PHPUnit/TestingEnvironment.php | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php index 5e9a3d3364..c1660bcff7 100644 --- a/tests/PHPUnit/TestingEnvironment.php +++ b/tests/PHPUnit/TestingEnvironment.php @@ -4,6 +4,32 @@ if (!defined('PIWIK_TEST_MODE')) { define('PIWIK_TEST_MODE', true); } +class Piwik_MockAccess +{ + private $access; + + public function __construct($access) + { + $this->access = $access; + $access->setSuperUser(true); + } + + public function __call($name, $arguments) + { + return call_user_func_array(array($this->access, $name), $arguments); + } + + public function reloadAccess($auth = null) + { + return true; + } + + public function getLogin() + { + return 'superUserLogin'; + } +} + /** * Sets the test environment. */ @@ -12,10 +38,8 @@ class Piwik_TestingEnvironment public static function addHooks() { Piwik_AddAction('Access.createAccessSingleton', function($access) { - $access->setSuperUser(true); - }); - Piwik_AddAction('Access.loadingSuperUserAccess', function(&$idSitesByAccess, &$login) { - $login = 'superUserLogin'; + $access = new Piwik_MockAccess($access); + \Piwik\Access::setSingletonInstance($access); }); Piwik_AddAction('Config.createConfigSingleton', function($config) { \Piwik\CacheFile::$invalidateOpCacheBeforeRead = true; @@ -46,9 +70,5 @@ class Piwik_TestingEnvironment $jsFiles[] = 'tests/resources/screenshot-override/jquery.waitforimages.js'; $jsFiles[] = 'tests/resources/screenshot-override/override.js'; }); - Piwik_AddAction('Request.dispatch', function () { - \Piwik\Access::setSingletonInstance(null); - \Piwik\Access::getInstance(); - }); } }
\ No newline at end of file |