mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 06:05:56 +00:00
Simplifying ModelAsControllerTest setUp
This commit is contained in:
parent
59be597004
commit
3820a26abd
@ -11,8 +11,6 @@ class ModelAsControllerTest extends FunctionalTest {
|
||||
|
||||
protected $autoFollowRedirection = false;
|
||||
|
||||
protected $orig = array();
|
||||
|
||||
/**
|
||||
* New tests require nested urls to be enabled, but the site might not
|
||||
* support nested URLs.
|
||||
@ -22,24 +20,9 @@ class ModelAsControllerTest extends FunctionalTest {
|
||||
public function setUp() {
|
||||
parent::setUp();
|
||||
|
||||
$this->orig['nested_urls'] = SiteTree::config()->nested_urls;
|
||||
Config::inst()->update('SiteTree', 'nested_urls', true);
|
||||
}
|
||||
|
||||
/**
|
||||
* New tests require nested urls to be enabled, but the site might not
|
||||
* support nested URLs.
|
||||
* This setup will enable nested-urls for this test and resets the state
|
||||
* after the tests have been performed.
|
||||
*/
|
||||
public function tearDown() {
|
||||
|
||||
if (isset($this->orig['nested_urls']) && !$this->orig['nested_urls']) {
|
||||
SiteTree::config()->nested_urls = false;
|
||||
}
|
||||
parent::tearDown();
|
||||
}
|
||||
|
||||
|
||||
protected function generateNestedPagesFixture() {
|
||||
$level1 = new Page();
|
||||
|
Loading…
x
Reference in New Issue
Block a user