tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 18:09:53 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Adding SiteConfig as Translatable dependency in SiteTreeTest and TranslatableTest (from r98228)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102634 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-13 03:17:14 +00:00
parent d7f2925dc8
commit b73d75f907
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/SiteTreeTest.php
View File

@ -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']);

1
tests/model/TranslatableTest.php
View File

@ -16,6 +16,7 @@ class TranslatableTest extends FunctionalTest {
protected $requiredExtensions = array(
'SiteTree' => array('Translatable'),
'SiteConfig' => array('Translatable'),
'TranslatableTest_DataObject' => array('Translatable'),
);