From 657a4852ee3741c23acba77ebf4050dbca72c734 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Tue, 6 Jul 2010 17:49:07 +0000
Subject: [PATCH] Fixing typos in tests Refs #1446
git-svn-id: http://dev.piwik.org/svn/trunk@2436 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
core/Tracker/Config.php | 9 +++++++--
tests/integration/Integration.php | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/core/Tracker/Config.php b/core/Tracker/Config.php
index f2ff7a6ea9..50f6023395 100644
--- a/core/Tracker/Config.php
+++ b/core/Tracker/Config.php
@@ -129,10 +129,15 @@ class Piwik_Tracker_Config
*/
public function setTestEnvironment()
{
- foreach(self::$toRestoreFromGlobalConfig as $section) {
+ if(!$this->initialized)
+ {
+ $this->init();
+ }
+ foreach(self::$toRestoreFromGlobalConfig as $section)
+ {
if(isset($this->configGlobal[$section]))
{
- $this->configUser = $this->configGlobal[$section];
+ $this->configUser[$section] = $this->configGlobal[$section];
}
}
$this->database = $this->database_tests;
diff --git a/tests/integration/Integration.php b/tests/integration/Integration.php
index d729475217..0ae8f9f562 100644
--- a/tests/integration/Integration.php
+++ b/tests/integration/Integration.php
@@ -161,11 +161,12 @@ abstract class Test_Integration extends Test_Database
parent::setUp();
// Make sure translations are loaded to check messages in English
Piwik_Translate::getInstance()->loadEnglishTranslation();
+
}
function tearDown()
{
- parent::setUp();
+ parent::tearDown();
Piwik_Translate::getInstance()->unloadEnglishTranslation();
}
--
GitLab