mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Changes relatives to templates from last commit.
This commit is contained in:
parent
21348169fa
commit
6f821e0d4d
9 changed files with 7 additions and 7 deletions
|
@ -70,7 +70,7 @@ class ProjectTaskTest extends CakeTestCase {
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
protected function _setupTestProject() {
|
protected function _setupTestProject() {
|
||||||
$skel = CAKE . 'Console' . DS . 'templates' . DS . 'skel';
|
$skel = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
|
||||||
$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
|
$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
|
||||||
$this->Task->bake($this->Task->path . 'bake_test_app', $skel);
|
$this->Task->bake($this->Task->path . 'bake_test_app', $skel);
|
||||||
}
|
}
|
||||||
|
@ -116,7 +116,7 @@ class ProjectTaskTest extends CakeTestCase {
|
||||||
*/
|
*/
|
||||||
public function testExecuteWithAbsolutePath() {
|
public function testExecuteWithAbsolutePath() {
|
||||||
$this->Task->args[0] = TMP . 'tests' . DS . 'bake_test_app';
|
$this->Task->args[0] = TMP . 'tests' . DS . 'bake_test_app';
|
||||||
$this->Task->params['skel'] = CAKE . 'Console' . DS . 'templates' . DS . 'skel';
|
$this->Task->params['skel'] = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
|
||||||
$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
|
$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
|
||||||
$this->Task->execute();
|
$this->Task->execute();
|
||||||
|
|
||||||
|
@ -269,7 +269,7 @@ class ProjectTaskTest extends CakeTestCase {
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function testExecute() {
|
public function testExecute() {
|
||||||
$this->Task->params['skel'] = CAKE . 'Console' . DS. 'templates' . DS . 'skel';
|
$this->Task->params['skel'] = CAKE . 'Console' . DS. 'Templates' . DS . 'skel';
|
||||||
$this->Task->params['working'] = TMP . 'tests' . DS;
|
$this->Task->params['working'] = TMP . 'tests' . DS;
|
||||||
|
|
||||||
$path = $this->Task->path . 'bake_test_app';
|
$path = $this->Task->path . 'bake_test_app';
|
||||||
|
|
|
@ -89,7 +89,7 @@ class TemplateTaskTest extends CakeTestCase {
|
||||||
public function testFindingInstalledThemesForBake() {
|
public function testFindingInstalledThemesForBake() {
|
||||||
$consoleLibs = CAKE . 'Console' . DS;
|
$consoleLibs = CAKE . 'Console' . DS;
|
||||||
$this->Task->initialize();
|
$this->Task->initialize();
|
||||||
$this->assertEqual($this->Task->templatePaths['default'], $consoleLibs . 'templates' . DS . 'default' . DS);
|
$this->assertEqual($this->Task->templatePaths['default'], $consoleLibs . 'Templates' . DS . 'default' . DS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -99,7 +99,7 @@ class TemplateTaskTest extends CakeTestCase {
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function testGetThemePath() {
|
public function testGetThemePath() {
|
||||||
$defaultTheme = CAKE . 'Console' . DS . 'templates' . DS . 'default' .DS;
|
$defaultTheme = CAKE . 'Console' . DS . 'Templates' . DS . 'default' .DS;
|
||||||
$this->Task->templatePaths = array('default' => $defaultTheme);
|
$this->Task->templatePaths = array('default' => $defaultTheme);
|
||||||
|
|
||||||
$this->Task->expects($this->exactly(1))->method('in')->will($this->returnValue('1'));
|
$this->Task->expects($this->exactly(1))->method('in')->will($this->returnValue('1'));
|
||||||
|
|
|
@ -146,7 +146,7 @@ class FolderTest extends CakeTestCase {
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function testOperations() {
|
public function testOperations() {
|
||||||
$path = CAKE . 'Console' . DS . 'templates' . DS . 'skel';
|
$path = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
|
||||||
$Folder = new Folder($path);
|
$Folder = new Folder($path);
|
||||||
|
|
||||||
$result = is_dir($Folder->pwd());
|
$result = is_dir($Folder->pwd());
|
||||||
|
@ -219,7 +219,7 @@ class FolderTest extends CakeTestCase {
|
||||||
public function testChmod() {
|
public function testChmod() {
|
||||||
$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Folder permissions tests not supported on Windows.');
|
$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Folder permissions tests not supported on Windows.');
|
||||||
|
|
||||||
$path = CAKE . 'Console' . DS . 'templates' . DS . 'skel';
|
$path = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
|
||||||
$Folder = new Folder($path);
|
$Folder = new Folder($path);
|
||||||
|
|
||||||
$subdir = 'test_folder_new';
|
$subdir = 'test_folder_new';
|
||||||
|
|
Loading…
Reference in a new issue