mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Remove unused code from ControllerTest
This commit is contained in:
parent
15bf13daa9
commit
cb361e8caf
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace SilverStripe\Control\Tests;
|
namespace SilverStripe\Control\Tests;
|
||||||
|
|
||||||
use InvalidArgumentException;
|
|
||||||
use SilverStripe\Control\Controller;
|
use SilverStripe\Control\Controller;
|
||||||
use SilverStripe\Control\Director;
|
use SilverStripe\Control\Director;
|
||||||
use SilverStripe\Control\Tests\ControllerTest\AccessBaseController;
|
use SilverStripe\Control\Tests\ControllerTest\AccessBaseController;
|
||||||
@ -15,7 +14,6 @@ use SilverStripe\Control\Tests\ControllerTest\IndexSecuredController;
|
|||||||
use SilverStripe\Control\Tests\ControllerTest\SubController;
|
use SilverStripe\Control\Tests\ControllerTest\SubController;
|
||||||
use SilverStripe\Control\Tests\ControllerTest\TestController;
|
use SilverStripe\Control\Tests\ControllerTest\TestController;
|
||||||
use SilverStripe\Control\Tests\ControllerTest\UnsecuredController;
|
use SilverStripe\Control\Tests\ControllerTest\UnsecuredController;
|
||||||
use SilverStripe\Dev\Deprecation;
|
|
||||||
use SilverStripe\Dev\FunctionalTest;
|
use SilverStripe\Dev\FunctionalTest;
|
||||||
use SilverStripe\Security\Member;
|
use SilverStripe\Security\Member;
|
||||||
use SilverStripe\Security\Security;
|
use SilverStripe\Security\Security;
|
||||||
@ -47,7 +45,6 @@ class ControllerTest extends FunctionalTest
|
|||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
Director::config()->update('alternate_base_url', '/');
|
Director::config()->update('alternate_base_url', '/');
|
||||||
$this->depSettings = Deprecation::dump_settings();
|
|
||||||
|
|
||||||
// Add test theme
|
// Add test theme
|
||||||
$themeDir = substr(__DIR__, strlen(FRAMEWORK_DIR)) . '/ControllerTest/';
|
$themeDir = substr(__DIR__, strlen(FRAMEWORK_DIR)) . '/ControllerTest/';
|
||||||
@ -58,12 +55,6 @@ class ControllerTest extends FunctionalTest
|
|||||||
SSViewer::set_themes($themes);
|
SSViewer::set_themes($themes);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function tearDown()
|
|
||||||
{
|
|
||||||
Deprecation::restore_settings($this->depSettings);
|
|
||||||
parent::tearDown();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testDefaultAction()
|
public function testDefaultAction()
|
||||||
{
|
{
|
||||||
/* For a controller with a template, the default action will simple run that template. */
|
/* For a controller with a template, the default action will simple run that template. */
|
||||||
|
Loading…
Reference in New Issue
Block a user