diff options
author | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-01 19:05:36 +0400 |
---|---|---|
committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-01 19:05:36 +0400 |
commit | 8a525ad008a5235744de7f6c922516a36d45c314 (patch) | |
tree | 89cdc1bc30b29752aadf4816807d0f715a3d33a9 /misc | |
parent | c8d8818e9dd3ed209f579e6fea4d1972a8a69521 (diff) |
Refs #4189, more work getting UI tests to pass and adding admin screenshots, including:
- make updatetoken.php use TestingEnvironment in testmode,
- allow persisted fixture to be dropped using new --drop command line option (for ui test runner),
- fix debugging mistake in realtime map, fix merge error in empty.twig,
- make sure Fixture prints to screen only for UI test setup, re-enable CustomAlerts fixture in OmniFixture,
- make sure forced now value for realtime map is constant,
- use *.getDatabaseConfig events to override database name in TestingEnvironment
- use TestingEnvironment in proxy/piwik.php
- add wait() method to screenshot testing framework's PageRenderer
- hide current UTC time in manage websites admin screenshot
Diffstat (limited to 'misc')
-rw-r--r-- | misc/cron/updatetoken.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/misc/cron/updatetoken.php b/misc/cron/updatetoken.php index f7cba2ab20..9e6713235b 100644 --- a/misc/cron/updatetoken.php +++ b/misc/cron/updatetoken.php @@ -31,7 +31,9 @@ if (!Common::isPhpCliMode()) { $testmode = in_array('--testmode', $_SERVER['argv']); if ($testmode) { - Config::getInstance()->setTestEnvironment(); + require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/TestingEnvironment.php"; + + \Piwik_TestingEnvironment::addHooks(); } $token = Db::get()->fetchOne("SELECT token_auth |