diff options
| -rw-r--r-- | appinfo/routes.php | 6 | ||||
| -rw-r--r-- | lib/Controller/FolderApiV2Controller.php | 6 | ||||
| -rw-r--r-- | tests/Unit/Controller/FolderApiV2ControllerTest.php | 18 |
3 files changed, 15 insertions, 15 deletions
diff --git a/appinfo/routes.php b/appinfo/routes.php index 139d4b2db..a50f4a5b7 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -61,9 +61,9 @@ return ['routes' => [ ['name' => 'api#index', 'url' => '/api', 'verb' => 'GET'], // API 2 -['name' => 'folder_api_v2#create_folder', 'url' => '/api/v2/folders', 'verb' => 'POST'], -['name' => 'folder_api_v2#update_folder', 'url' => '/api/v2/folders/{folderId}', 'verb' => 'PATCH'], -['name' => 'folder_api_v2#delete_folder', 'url' => '/api/v2/folders/{folderId}', 'verb' => 'DELETE'], +['name' => 'folder_api_v2#create', 'url' => '/api/v2/folders', 'verb' => 'POST'], +['name' => 'folder_api_v2#update', 'url' => '/api/v2/folders/{folderId}', 'verb' => 'PATCH'], +['name' => 'folder_api_v2#delete', 'url' => '/api/v2/folders/{folderId}', 'verb' => 'DELETE'], // API 1.2 ['name' => 'user_api#index', 'url' => '/api/v1-2/user', 'verb' => 'GET'], diff --git a/lib/Controller/FolderApiV2Controller.php b/lib/Controller/FolderApiV2Controller.php index 049be579e..683169006 100644 --- a/lib/Controller/FolderApiV2Controller.php +++ b/lib/Controller/FolderApiV2Controller.php @@ -48,7 +48,7 @@ class FolderApiV2Controller extends ApiController * @param string $name * @return array|mixed|\OCP\AppFramework\Http\JSONResponse */ - public function createFolder($name) + public function create($name) { try { $this->folderService->purgeDeleted($this->getUserId(), false); @@ -73,7 +73,7 @@ class FolderApiV2Controller extends ApiController * @param string $name * @return array|\OCP\AppFramework\Http\JSONResponse */ - public function updateFolder($folderId, $name) + public function update($folderId, $name) { $response = null; try { @@ -100,7 +100,7 @@ class FolderApiV2Controller extends ApiController * @param int $folderId * @return array|\OCP\AppFramework\Http\JSONResponse */ - public function deleteFolder($folderId) + public function delete($folderId) { try { $responseData = $this->serializeEntity( diff --git a/tests/Unit/Controller/FolderApiV2ControllerTest.php b/tests/Unit/Controller/FolderApiV2ControllerTest.php index ca3d7f575..4ed79aa5b 100644 --- a/tests/Unit/Controller/FolderApiV2ControllerTest.php +++ b/tests/Unit/Controller/FolderApiV2ControllerTest.php @@ -84,7 +84,7 @@ class FolderApiV2ControllerTest extends TestCase ->with($this->equalTo($this->user->getUID()), $this->equalTo($folderName)) ->will($this->returnValue($folder)); - $response = $this->folderAPI->createFolder($folderName); + $response = $this->folderAPI->create($folderName); $data = $response->getData(); $this->assertEquals( @@ -105,7 +105,7 @@ class FolderApiV2ControllerTest extends TestCase ->method('create') ->will($this->throwException(new ServiceConflictException('exists'))); - $response = $this->folderAPI->createFolder('hi'); + $response = $this->folderAPI->create('hi'); $this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus()); } @@ -122,7 +122,7 @@ class FolderApiV2ControllerTest extends TestCase ->method('create') ->will($this->throwException(new ServiceValidationException($msg))); - $response = $this->folderAPI->createFolder('hi'); + $response = $this->folderAPI->create('hi'); $data = $response->getData(); $this->assertEquals($msg, $data['error']['message']); @@ -140,7 +140,7 @@ class FolderApiV2ControllerTest extends TestCase ->with($this->equalTo($this->user->getUID()), $this->equalTo($folderId)) ->will($this->returnValue($folder)); - $response = $this->folderAPI->deleteFolder(23); + $response = $this->folderAPI->delete(23); $data = $response->getData(); $this->assertEquals( @@ -164,7 +164,7 @@ class FolderApiV2ControllerTest extends TestCase ) ); - $response = $this->folderAPI->deleteFolder($folderId); + $response = $this->folderAPI->delete($folderId); $data = $response->getData(); $this->assertEquals($this->msg, $data['error']['message']); @@ -185,7 +185,7 @@ class FolderApiV2ControllerTest extends TestCase $this->equalTo($folderName) ); - $this->folderAPI->updateFolder($folderId, $folderName); + $this->folderAPI->update($folderId, $folderName); } public function testUpdateDoesNotExist() @@ -201,7 +201,7 @@ class FolderApiV2ControllerTest extends TestCase ) ); - $response = $this->folderAPI->updateFolder($folderId, $folderName); + $response = $this->folderAPI->update($folderId, $folderName); $data = $response->getData(); $this->assertEquals($this->msg, $data['error']['message']); @@ -222,7 +222,7 @@ class FolderApiV2ControllerTest extends TestCase ) ); - $response = $this->folderAPI->updateFolder($folderId, $folderName); + $response = $this->folderAPI->update($folderId, $folderName); $this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus()); } @@ -241,7 +241,7 @@ class FolderApiV2ControllerTest extends TestCase ) ); - $response = $this->folderAPI->updateFolder($folderId, $folderName); + $response = $this->folderAPI->update($folderId, $folderName); $data = $response->getData(); $this->assertEquals($this->msg, $data['error']['message']); |