summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-05-12 13:02:01 +0200
committerMorris Jobke <morris.jobke@gmail.com>2013-05-12 13:02:01 +0200
commite2bd32323d30cb5da7b2e1433d09effd33ef987d (patch)
tree047ed53d3c1f38c164b267d3f1dfc67f4d686bd1 /apps/files
parentb777c0fd7501c59f0389c34303e98867e94cd20b (diff)
downloadnextcloud-server-e2bd32323d30cb5da7b2e1433d09effd33ef987d.tar.gz
nextcloud-server-e2bd32323d30cb5da7b2e1433d09effd33ef987d.zip
[files] fix mock creation and remove hardcoded 'require' statement
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/ajax/rename.php2
-rw-r--r--apps/files/tests/ajax_rename.php7
2 files changed, 2 insertions, 7 deletions
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index d9ba68428ee..f4551858283 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -21,8 +21,6 @@
*
*/
-require_once realpath( dirname(__FILE__).'/../lib/app.php' );
-
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 6dc7c120b3b..23e5761ddda 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -21,18 +21,15 @@
*
*/
-
-require_once dirname(__FILE__).'/../lib/app.php';
-
class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
function setUp() {
// mock OC_L10n
- $l10nMock = $this->getMock('\OC_L10N', array('t'));
+ $l10nMock = $this->getMock('\OC_L10N', array('t'), array(), '', false);
$l10nMock->expects($this->any())
->method('t')
->will($this->returnArgument(0));
- $viewMock = $this->getMock('\OC\Files\View', array('rename', 'normalizePath'));
+ $viewMock = $this->getMock('\OC\Files\View', array('rename', 'normalizePath'), array(), '', false);
$viewMock->expects($this->any())
->method('normalizePath')
->will($this->returnArgument(0));