ソースを参照

[files] rename lib to "App"

tags/v6.0.0alpha2
Morris Jobke 11年前
コミット
b777c0fd75
3個のファイルの変更7行の追加7行の削除
  1. 2
    2
      apps/files/ajax/rename.php
  2. 1
    1
      apps/files/lib/app.php
  3. 4
    4
      apps/files/tests/ajax_rename.php

+ 2
- 2
apps/files/ajax/rename.php ファイルの表示

@@ -21,12 +21,12 @@
*
*/

require_once realpath( dirname(__FILE__).'/../lib/files.php' );
require_once realpath( dirname(__FILE__).'/../lib/app.php' );

OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();

$files = new \OCA\Files\Files(
$files = new \OCA\Files\App(
\OC\Files\Filesystem::getView(),
\OC_L10n::get('files')
);

apps/files/lib/files.php → apps/files/lib/app.php ファイルの表示

@@ -24,7 +24,7 @@

namespace OCA\Files;

class Files {
class App {
private $l10n;

public function __construct($view, $l10n) {

+ 4
- 4
apps/files/tests/ajax_rename.php ファイルの表示

@@ -22,9 +22,9 @@
*/


require_once dirname(__FILE__).'/../lib/files.php';
require_once dirname(__FILE__).'/../lib/app.php';

class Test_OC_Files_Files_Rename extends \PHPUnit_Framework_TestCase {
class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {

function setUp() {
// mock OC_L10n
@@ -39,7 +39,7 @@ class Test_OC_Files_Files_Rename extends \PHPUnit_Framework_TestCase {
$viewMock->expects($this->any())
->method('rename')
->will($this->returnValue(true));
$this->files = new \OCA\Files\Files($viewMock, $l10nMock);
$this->files = new \OCA\Files\App($viewMock, $l10nMock);
}

/**
@@ -91,7 +91,7 @@ class Test_OC_Files_Files_Rename extends \PHPUnit_Framework_TestCase {
$result = $this->files->rename($dir, $oldname, $newname);
$expected = array(
'success' => false,
'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved by Owncloud")
'data' => array('message' => "Invalid folder name. Usage of 'Shared' is reserved by ownCloud")
);

$this->assertEquals($expected, $result);

読み込み中…
キャンセル
保存