Fixing Scaffold tests

This commit is contained in:
Jose Lorenzo Rodriguez 2011-05-17 12:44:38 -04:30
parent 1b14887e3a
commit 12e7347272

View file

@ -282,6 +282,7 @@ class ScaffoldViewTest extends CakeTestCase {
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS), 'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),
'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) 'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin');
} }
/** /**
@ -292,6 +293,7 @@ class ScaffoldViewTest extends CakeTestCase {
function tearDown() { function tearDown() {
parent::tearDown(); parent::tearDown();
unset($this->Controller, $this->request); unset($this->Controller, $this->request);
CakePlugin::unload();
} }
/** /**
@ -369,12 +371,12 @@ class ScaffoldViewTest extends CakeTestCase {
$ScaffoldView = new TestScaffoldView($Controller); $ScaffoldView = new TestScaffoldView($Controller);
$result = $ScaffoldView->testGetFilename('admin_add'); $result = $ScaffoldView->testGetFilename('admin_add');
$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' $expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin'
. DS .'test_plugin' . DS . 'View' . DS . 'tests' . DS . 'scaffold.form.ctp'; . DS .'TestPlugin' . DS . 'View' . DS . 'Tests' . DS . 'scaffold.form.ctp';
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = $ScaffoldView->testGetFilename('add'); $result = $ScaffoldView->testGetFilename('add');
$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' $expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin'
. DS .'test_plugin' . DS . 'View' . DS . 'tests' . DS . 'scaffold.form.ctp'; . DS .'TestPlugin' . DS . 'View' . DS . 'Tests' . DS . 'scaffold.form.ctp';
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
Configure::write('Routing.prefixes', $_admin); Configure::write('Routing.prefixes', $_admin);