tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3094 from dhensby/patch-3

Browse Source 
Use Config nesting in `SapphireTest::useTestTheme()`
This commit is contained in:
Simon Welsh 2014-08-07 20:50:16 +10:00
commit a0a2aac6df
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev/SapphireTest.php
View File

@ -962,13 +962,13 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
* @param $callback Closure * @param $callback Closure
*/ */
protected function useTestTheme($themeBaseDir, $theme, $callback) { protected function useTestTheme($themeBaseDir, $theme, $callback) {
Config::nest();
global $project; global $project;
$manifest = new SS_TemplateManifest($themeBaseDir, $project, true, true); $manifest = new SS_TemplateManifest($themeBaseDir, $project, true, true);
SS_TemplateLoader::instance()->pushManifest($manifest); SS_TemplateLoader::instance()->pushManifest($manifest);
$origTheme = Config::inst()->get('SSViewer', 'theme');
Config::inst()->update('SSViewer', 'theme', $theme); Config::inst()->update('SSViewer', 'theme', $theme);
$e = null; $e = null;
@ -978,7 +978,8 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
// Remove all the test themes we created // Remove all the test themes we created
SS_TemplateLoader::instance()->popManifest(); SS_TemplateLoader::instance()->popManifest();
Config::inst()->update('SSViewer', 'theme', $origTheme);
Config::unnest();
if ($e) throw $e; if ($e) throw $e;
} }