From e2bd32323d30cb5da7b2e1433d09effd33ef987d Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Sun, 12 May 2013 13:02:01 +0200 Subject: [PATCH] [files] fix mock creation and remove hardcoded 'require' statement --- apps/files/ajax/rename.php | 2 -- apps/files/tests/ajax_rename.php | 7 ++----- 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));