tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

FIX wrongly named themes after themestack API change (#1548)

Browse Source
This commit is contained in:
Hamish Friedlander 2016-07-15 17:13:53 +12:00 committed by Sam Minnée
parent 7e5f0087b8
commit 0f950800ef
6 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/controller/ContentControllerTest.php
View File

@ -183,8 +183,7 @@ class ContentControllerTest extends FunctionalTest {
$controller = new ContentController($page);
$viewer = $controller->getViewer('test');
$templateList = array('ContentControllerTestPage_test', 'Page');
$expected = SS_TemplateLoader::instance()->findTemplates($templateList, 'controllertest');
$self->assertEquals($expected, $viewer->templates());
$self->assertEquals(dirname(__FILE__).'/themes/controllertest/templates/ContentControllerTestPage_test.ss', $viewer->templates()['main']);
});
}

0
tests/controller/themes/controllertest/ContentControllerTestPageWithoutController.ss → tests/controller/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss
View File

0
tests/controller/themes/controllertest/ContentControllerTestPage_test.ss → tests/controller/themes/controllertest/templates/ContentControllerTestPage_test.ss
View File

0
tests/controller/themes/controllertest/Controller.ss → tests/controller/themes/controllertest/templates/Controller.ss
View File

0
tests/controller/themes/controllertest/Layout/Page.ss → tests/controller/themes/controllertest/templates/Layout/Page.ss
View File

0
tests/controller/themes/controllertest/Page.ss → tests/controller/themes/controllertest/templates/Page.ss
View File