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

Use Config nesting in SapphireTest::useTestTheme()

Browse Source 
Using the Config nesting functionality to restore variables
This commit is contained in:
Daniel Hensby 2014-05-02 15:25:31 +01:00
parent 612a096765
commit 5298371282
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

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