mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-08 09:08:50 +02:00
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
This commit is contained in:
parent
d7f2925dc8
commit
b73d75f907
@ -23,8 +23,10 @@ class SiteTreeTest extends SapphireTest {
|
|||||||
Translatable::set_default_locale("en_US");
|
Translatable::set_default_locale("en_US");
|
||||||
|
|
||||||
// refresh the decorated statics - different fields in $db with Translatable enabled
|
// 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('SiteTree', 'Translatable');
|
||||||
|
Object::remove_extension('SiteConfig', 'Translatable');
|
||||||
|
}
|
||||||
|
|
||||||
// recreate database with new settings
|
// recreate database with new settings
|
||||||
$dbname = self::create_temp_db();
|
$dbname = self::create_temp_db();
|
||||||
@ -34,8 +36,11 @@ class SiteTreeTest extends SapphireTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static function tear_down_once() {
|
static function tear_down_once() {
|
||||||
if(self::$origTranslatableSettings['has_extension'])
|
if(self::$origTranslatableSettings['has_extension']) {
|
||||||
Object::add_extension('SiteTree', 'Translatable');
|
Object::add_extension('SiteTree', 'Translatable');
|
||||||
|
Object::add_extension('SiteConfig', 'Translatable');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Translatable::set_default_locale(self::$origTranslatableSettings['default_locale']);
|
Translatable::set_default_locale(self::$origTranslatableSettings['default_locale']);
|
||||||
Translatable::set_current_locale(self::$origTranslatableSettings['default_locale']);
|
Translatable::set_current_locale(self::$origTranslatableSettings['default_locale']);
|
||||||
|
@ -16,6 +16,7 @@ class TranslatableTest extends FunctionalTest {
|
|||||||
|
|
||||||
protected $requiredExtensions = array(
|
protected $requiredExtensions = array(
|
||||||
'SiteTree' => array('Translatable'),
|
'SiteTree' => array('Translatable'),
|
||||||
|
'SiteConfig' => array('Translatable'),
|
||||||
'TranslatableTest_DataObject' => array('Translatable'),
|
'TranslatableTest_DataObject' => array('Translatable'),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user