From 3820a26abdc1f96b7fe680d7010392492ed97034 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Mon, 22 Aug 2016 19:33:17 +0100 Subject: [PATCH] Simplifying ModelAsControllerTest setUp --- tests/controller/ModelAsControllerTest.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/tests/controller/ModelAsControllerTest.php b/tests/controller/ModelAsControllerTest.php index b1fae3d2..e095c333 100644 --- a/tests/controller/ModelAsControllerTest.php +++ b/tests/controller/ModelAsControllerTest.php @@ -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();