Refs matomo-org#2935, fixing Installation UI test.

sabl0r · Mar 12, 2014 · f05c080 · f05c080
1 parent cb837f7
commit f05c080
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
@@ -103,32 +103,34 @@ public static function addHooks()
             }
         }
 
+        \Piwik\CacheFile::$invalidateOpCacheBeforeRead = true;
+
         Piwik::addAction('Access.createAccessSingleton', function($access) use ($testingEnvironment) {
             if (!$testingEnvironment->testUseRegularAuth) {
                 $access = new Piwik_MockAccess($access);
                 \Piwik\Access::setSingletonInstance($access);
             }
         });
-        Piwik::addAction('Config.createConfigSingleton', function($config) use ($testingEnvironment) {
-            \Piwik\CacheFile::$invalidateOpCacheBeforeRead = true;
-
-            $config->setTestEnvironment();
+        if (!$testingEnvironment->dontUseTestConfig) {
+            Piwik::addAction('Config.createConfigSingleton', function($config) use ($testingEnvironment) {
+                $config->setTestEnvironment();
 
-            $manager = \Piwik\Plugin\Manager::getInstance();
-            $pluginsToLoad = $manager->getPluginsToLoadDuringTests();
-            $config->Plugins = array('Plugins' => $pluginsToLoad);
+                $manager = \Piwik\Plugin\Manager::getInstance();
+                $pluginsToLoad = $manager->getPluginsToLoadDuringTests();
+                $config->Plugins = array('Plugins' => $pluginsToLoad);
 
-            $trackerPluginsToLoad = array_filter($pluginsToLoad, function ($plugin) use ($manager) {
-                return $manager->isTrackerPlugin($manager->loadPlugin($plugin));
-            });
+                $trackerPluginsToLoad = array_filter($pluginsToLoad, function ($plugin) use ($manager) {
+                    return $manager->isTrackerPlugin($manager->loadPlugin($plugin));
+                });
 
-            $config->Plugins_Tracker = array('Plugins_Tracker' => $trackerPluginsToLoad);
-            $config->log['log_writers'] = array('file');
+                $config->Plugins_Tracker = array('Plugins_Tracker' => $trackerPluginsToLoad);
+                $config->log['log_writers'] = array('file');
 
-            $manager->unloadPlugins();
+                $manager->unloadPlugins();
 
-            $testingEnvironment->logVariables();
-        });
+                $testingEnvironment->logVariables();
+            });
+        }
         Piwik::addAction('Db.getDatabaseConfig', function (&$dbConfig) use ($testingEnvironment) {
             if ($testingEnvironment->dbName) {
                 $dbConfig['dbname'] = $testingEnvironment->dbName;
@@ -168,7 +170,7 @@ public static function addHooks()
         });
         Piwik::addAction('Updater.checkForUpdates', function () {
             try {
-                \Piwik\Filesystem::deleteAllCacheOnUpdate();
+                @\Piwik\Filesystem::deleteAllCacheOnUpdate();
             } catch (Exception $ex) {
                 // pass
             }

diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
diff --git a/tests/lib/screenshot-testing/support/test-environment.js b/tests/lib/screenshot-testing/support/test-environment.js
@@ -24,7 +24,14 @@ TestingEnvironment.prototype.reload = function () {
 };
 
 TestingEnvironment.prototype.save = function () {
-    fs.write(testingEnvironmentOverridePath, JSON.stringify(this));
+    var copy = {};
+    for (var key in this) {
+        copy[key] = this[key];
+    }
+
+    delete copy.backup;
+
+    fs.write(testingEnvironmentOverridePath, JSON.stringify(copy));
 };
 
 TestingEnvironment.prototype.callApi = function (method, params, done) {