From b73d75f90770b754dde069996c13881edca3cbf4 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 13 Apr 2010 03:17:14 +0000 Subject: [PATCH] MINOR Adding SiteConfig as Translatable dependency in SiteTreeTest and TranslatableTest (from r98228) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102634 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/SiteTreeTest.php | 9 +++++++-- tests/model/TranslatableTest.php | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/SiteTreeTest.php b/tests/SiteTreeTest.php index acf519438..bab8005a5 100755 --- a/tests/SiteTreeTest.php +++ b/tests/SiteTreeTest.php @@ -23,8 +23,10 @@ class SiteTreeTest extends SapphireTest { Translatable::set_default_locale("en_US"); // refresh the decorated statics - different fields in $db with Translatable enabled - if(self::$origTranslatableSettings['has_extension']) + if(self::$origTranslatableSettings['has_extension']) { Object::remove_extension('SiteTree', 'Translatable'); + Object::remove_extension('SiteConfig', 'Translatable'); + } // recreate database with new settings $dbname = self::create_temp_db(); @@ -34,8 +36,11 @@ class SiteTreeTest extends SapphireTest { } static function tear_down_once() { - if(self::$origTranslatableSettings['has_extension']) + if(self::$origTranslatableSettings['has_extension']) { Object::add_extension('SiteTree', 'Translatable'); + Object::add_extension('SiteConfig', 'Translatable'); + } + Translatable::set_default_locale(self::$origTranslatableSettings['default_locale']); Translatable::set_current_locale(self::$origTranslatableSettings['default_locale']); diff --git a/tests/model/TranslatableTest.php b/tests/model/TranslatableTest.php index adf71163b..7ff4509eb 100755 --- a/tests/model/TranslatableTest.php +++ b/tests/model/TranslatableTest.php @@ -16,6 +16,7 @@ class TranslatableTest extends FunctionalTest { protected $requiredExtensions = array( 'SiteTree' => array('Translatable'), + 'SiteConfig' => array('Translatable'), 'TranslatableTest_DataObject' => array('Translatable'), );