|
|
@@ -635,12 +635,23 @@ class ViewTest extends TestCase {
|
|
|
$View = new TestView();
|
|
|
|
|
|
// Prefix specific layout
|
|
|
- $View->request->params['prefix'] = 'FooPrefix';
|
|
|
+ $View->request->params['prefix'] = 'foo_prefix';
|
|
|
$expected = TEST_APP . 'TestApp' . DS . 'Template' . DS .
|
|
|
'FooPrefix' . DS . 'Layout' . DS . 'default.ctp';
|
|
|
$result = $View->getLayoutFileName();
|
|
|
$this->assertPathEquals($expected, $result);
|
|
|
|
|
|
+ $View->request->params['prefix'] = 'FooPrefix';
|
|
|
+ $result = $View->getLayoutFileName();
|
|
|
+ $this->assertPathEquals($expected, $result);
|
|
|
+
|
|
|
+ // Nested prefix layout
|
|
|
+ $View->request->params['prefix'] = 'foo_prefix/bar_prefix';
|
|
|
+ $expected = TEST_APP . 'TestApp' . DS . 'Template' . DS .
|
|
|
+ 'FooPrefix' . DS . 'BarPrefix' . DS . 'Layout' . DS . 'default.ctp';
|
|
|
+ $result = $View->getLayoutFileName();
|
|
|
+ $this->assertPathEquals($expected, $result);
|
|
|
+
|
|
|
// Fallback to app's layout
|
|
|
$View->request->params['prefix'] = 'Admin';
|
|
|
$expected = TEST_APP . 'TestApp' . DS . 'Template' . DS .
|