From ca27d3e3742bea3cce129873938e4dc0c9996dbb Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 25 Nov 2022 23:55:35 +0100 Subject: [PATCH] test fixes --- Controller/ApiController.php | 4 ++-- .../Controller/Api/ApiControllerCollectionTrait.php | 1 + tests/Controller/Api/ApiControllerMediaTrait.php | 13 ++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 98bde9f..73f912e 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -270,7 +270,7 @@ final class ApiController extends Controller ApplicationAbstract $app = null ) : Media { - if ($status['status'] !== UploadStatus::OK) { + if (!isset($status['status']) || $status['status'] !== UploadStatus::OK) { return new NullMedia(); } @@ -696,7 +696,7 @@ final class ApiController extends Controller $ids = []; foreach ($status as $stat) { $created = self::createDbEntry( - $status, + $stat, $request->header->account, $virtualPath, $request->getData('type', 'int'), diff --git a/tests/Controller/Api/ApiControllerCollectionTrait.php b/tests/Controller/Api/ApiControllerCollectionTrait.php index ea9510f..e66fe8a 100755 --- a/tests/Controller/Api/ApiControllerCollectionTrait.php +++ b/tests/Controller/Api/ApiControllerCollectionTrait.php @@ -119,6 +119,7 @@ trait ApiControllerCollectionTrait $request->header->account = 1; $request->setData('name', 'Test Collection'); $request->setData('path', '/test/path'); + $request->setData('create_directory', true); $this->module->apiCollectionCreate($request, $response); diff --git a/tests/Controller/Api/ApiControllerMediaTrait.php b/tests/Controller/Api/ApiControllerMediaTrait.php index 81dec2c..60a748d 100755 --- a/tests/Controller/Api/ApiControllerMediaTrait.php +++ b/tests/Controller/Api/ApiControllerMediaTrait.php @@ -60,7 +60,18 @@ trait ApiControllerMediaTrait ], ]; - $ids = $this->module->createDbEntries($status, 1); + $ids = []; + foreach ($status as $stat) { + $created = $this->module::createDbEntry( + $status, + 1 + ); + + if ($created->getId() > 0) { + $ids[] = $created->getId(); + } + } + self::assertCount(2, $ids); }