From: eileen <eileen@fuzion.co.nz>
Date: Fri, 12 Apr 2013 05:32:44 +0000 (+1200)
Subject: really finally working
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f64cd471f12464b4cdf7f43198489eced9d2ac58;p=civicrm-core.git

really finally working
---

diff --git a/tests/phpunit/CRM/Core/BAO/SettingTest.php b/tests/phpunit/CRM/Core/BAO/SettingTest.php
index b2b59698b5..097dce012e 100644
--- a/tests/phpunit/CRM/Core/BAO/SettingTest.php
+++ b/tests/phpunit/CRM/Core/BAO/SettingTest.php
@@ -130,16 +130,9 @@ class CRM_Core_BAO_SettingTest extends CiviUnitTestCase {
     $checkresult = CRM_Core_DAO::singleValueQuery($checkSQL);
     $this->assertEquals(1, $checkresult, "Check that maxAttachments has been saved to database not just stored in config");
     $sql = " DELETE FROM civicrm_setting WHERE name = 'max_attachments'";
-    $currentDomain = CRM_Core_Config::domainID();
-<<<<<<< Updated upstream
-
     CRM_Core_DAO::executeQuery($sql);
-    CRM_Core_BAO_Setting::inCache('CiviCRM Preferences', 'max_attachments', NULL, NULL, TRUE, $currentDomain, TRUE);
-    CRM_Core_BAO_Setting::updateSettingsFromMetaData();
-=======
->>>>>>> Stashed changes
 
-    CRM_Core_DAO::executeQuery($sql);
+    $currentDomain = CRM_Core_Config::domainID();
     // we are setting up an artificial situation here as we are trying to drive out
     // previous memory of this setting so we need to flush it out
     $cachekey =  CRM_Core_BAO_Setting::inCache('CiviCRM Preferences', 'max_attachments', NULL, NULL, TRUE, $currentDomain);
diff --git a/tests/phpunit/api/v3/SettingTest.php b/tests/phpunit/api/v3/SettingTest.php
index de394c590e..dc78e6d63d 100644
--- a/tests/phpunit/api/v3/SettingTest.php
+++ b/tests/phpunit/api/v3/SettingTest.php
@@ -511,6 +511,7 @@ class api_v3_SettingTest extends CiviUnitTestCase {
     $result = civicrm_api('setting', 'get', $params);
     $this->assertAPISuccess($result, "in line " . __LINE__);
     $this->assertArrayHasKey('tag_unconfirmed', $result['values'][$dom['id']]);
+    $this->assertArrayHasKey('extensionsDir', $result['values'][$dom['id']]);
     $this->assertEquals('Unconfirmed', $result['values'][$dom['id']]['tag_unconfirmed']);
   }
 }