Fixing UI tests.

core/AssetManager.php

@@ -337,6 +337,8 @@ class AssetManager
      */
     private static function generateMergedJsFile()
     {
+        $mergedContent = "";
+        
         // Loop through each js file
         $files = self::getJsFiles();
         foreach ($files as $file) {

plugins/CoreHome/Controller.php

@@ -90,7 +90,7 @@ class Controller extends \Piwik\Controller
         $websiteId = Common::getRequestVar('idSite', false, 'int');
         if ($websiteId) {
             $website = new Site($websiteId);
-            $datetimeCreationDate = $this->site->getCreationDate()->getDatetime();
+            $datetimeCreationDate = $website->getCreationDate()->getDatetime();
             $creationDateLocalTimezone = Date::factory($datetimeCreationDate, $website->getTimezone())->toString('Y-m-d');
             $todayLocalTimezone = Date::factory('now', $website->getTimezone())->toString('Y-m-d');
             if ($creationDateLocalTimezone == $todayLocalTimezone) {

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