diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-10-24 10:57:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 10:57:47 +0200 |
| commit | 57a5551c3d542f1412754d0f519cfaf03ced4eb3 (patch) | |
| tree | f480d88d2d6dd2ba5ba725d733bec1a5129948a3 /apps/files_sharing/tests/ApiTest.php | |
| parent | ab91fa2660f15102b29254bc1c236101c6dcc6a3 (diff) | |
| parent | 6604e76e9482f35cbec4d02c7ffb792c889fd2e5 (diff) | |
| download | nextcloud-server-57a5551c3d542f1412754d0f519cfaf03ced4eb3.tar.gz nextcloud-server-57a5551c3d542f1412754d0f519cfaf03ced4eb3.zip | |
Merge pull request #1853 from nextcloud/fix_di_share_api
Moved Share20OCS to proper Controller location
Diffstat (limited to 'apps/files_sharing/tests/ApiTest.php')
| -rw-r--r-- | apps/files_sharing/tests/ApiTest.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php index aff3aadd7e7..6ab0cb4e1a6 100644 --- a/apps/files_sharing/tests/ApiTest.php +++ b/apps/files_sharing/tests/ApiTest.php @@ -30,6 +30,7 @@ namespace OCA\Files_Sharing\Tests; use OC\Files\Cache\Scanner; +use OCA\Files_Sharing\Controller\ShareAPIController; use OCP\AppFramework\OCS\OCSBadRequestException; use OCP\AppFramework\OCS\OCSException; use OCP\AppFramework\OCS\OCSForbiddenException; @@ -92,18 +93,16 @@ class ApiTest extends TestCase { /** * @param string $userId The userId of the caller - * @return \OCA\Files_Sharing\API\Share20OCS + * @return \OCA\Files_Sharing\Controller\ShareAPIController */ private function createOCS($userId) { - $currentUser = \OC::$server->getUserManager()->get($userId); - $l = $this->getMockBuilder('\OCP\IL10N')->getMock(); $l->method('t') ->will($this->returnCallback(function($text, $parameters = []) { return vsprintf($text, $parameters); })); - return new \OCA\Files_Sharing\API\Share20OCS( + return new ShareAPIController( self::APP_NAME, $this->getMockBuilder('OCP\IRequest')->getMock(), $this->shareManager, @@ -111,7 +110,7 @@ class ApiTest extends TestCase { \OC::$server->getUserManager(), \OC::$server->getRootFolder(), \OC::$server->getURLGenerator(), - $currentUser, + $userId, $l ); } @@ -715,7 +714,6 @@ class ApiTest extends TestCase { /* * Test as recipient */ - $request = $this->createRequest(['path' => '/', 'subfiles' => 'true']); $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER3); $result = $ocs->getShares(); $ocs->cleanup(); |