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

BUGFIX: restore the original nested_urls state after running the test, so we can enable and disable nested URLs within the tests safely. (from r98860)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102806 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-14 03:46:23 +00:00
parent feabab3808
commit dcd5ef9c77
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev/SapphireTest.php
View File

@ -34,6 +34,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
protected $originalRequirements; protected $originalRequirements;
protected $originalIsRunningTest; protected $originalIsRunningTest;
protected $originalTheme; protected $originalTheme;
protected $originalNestedURLsState;
protected $mailer; protected $mailer;
@ -109,6 +110,9 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
Controller::curr()->setSession(new Session(array())); Controller::curr()->setSession(new Session(array()));
$this->originalTheme = SSViewer::current_theme(); $this->originalTheme = SSViewer::current_theme();
// Save nested_urls state, so we can restore it later
$this->originalNestedURLsState = SiteTree::nested_urls();
$className = get_class($this); $className = get_class($this);
$fixtureFile = eval("return {$className}::\$fixture_file;"); $fixtureFile = eval("return {$className}::\$fixture_file;");
@ -346,6 +350,12 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
// Reset mocked datetime // Reset mocked datetime
SS_Datetime::clear_mock_now(); SS_Datetime::clear_mock_now();
// Restore nested_urls state
if ( $this->originalNestedURLsState )
SiteTree::enable_nested_urls();
else
SiteTree::disable_nested_urls();
} }
/** /**
* Clear the log of emails sent * Clear the log of emails sent