Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updating folder + test case to reflect api changes.

  • Loading branch information...
commit fe3514371f37e98d603a8ca09eb07330a89d3cbc 1 parent 5fa6e5b
@markstory markstory authored
Showing with 6 additions and 6 deletions.
  1. +1 −1  cake/libs/folder.php
  2. +5 −5 cake/tests/cases/libs/folder.test.php
View
2  cake/libs/folder.php
@@ -627,7 +627,7 @@ function copy($options = array()) {
}
if (!is_dir($toDir)) {
- $this->mkdir($toDir, $mode);
+ $this->create($toDir, $mode);
}
if (!is_writable($toDir)) {
View
10 cake/tests/cases/libs/folder.test.php
@@ -110,7 +110,7 @@ function testOperations() {
$this->assertTrue($result);
$copy = TMP . 'test_folder_copy';
- $result = $Folder->cp($copy);
+ $result = $Folder->copy($copy);
$this->assertTrue($result);
$copy = TMP . 'test_folder_copy';
@@ -125,7 +125,7 @@ function testOperations() {
$this->assertTrue($result);
$mv = TMP . 'test_folder_mv_2';
- $result = $Folder->mv($mv);
+ $result = $Folder->move($mv);
$this->assertTrue($result);
$result = $Folder->delete($new);
@@ -134,7 +134,7 @@ function testOperations() {
$result = $Folder->delete($mv);
$this->assertTrue($result);
- $result = $Folder->rm($mv);
+ $result = $Folder->delete($mv);
$this->assertTrue($result);
$new = APP . 'index.php';
@@ -452,7 +452,7 @@ function testFind() {
$Folder->cd(TMP);
$file = new File($Folder->pwd() . DS . 'paths.php', true);
- $Folder->mkdir($Folder->pwd() . DS . 'testme');
+ $Folder->create($Folder->pwd() . DS . 'testme');
$Folder->cd('testme');
$result = $Folder->find('paths\.php');
$expected = array();
@@ -493,7 +493,7 @@ function testFindRecursive() {
$this->assertIdentical($result, $expected);
$Folder->cd(TMP);
- $Folder->mkdir($Folder->pwd() . DS . 'testme');
+ $Folder->create($Folder->pwd() . DS . 'testme');
$Folder->cd('testme');
$File =& new File($Folder->pwd() . DS . 'paths.php');
$File->create();
Please sign in to comment.
Something went wrong with that request. Please try again.