diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 21cc724..f01c3b2 100644 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -83,7 +83,7 @@ return [ ], ], [ - 'dest' => '\Modules\FleetManagement\Controller\ApiVehicleController:apiNoteEdit', + 'dest' => '\Modules\FleetManagement\Controller\ApiVehicleController:apiNoteUpdate', 'verb' => RouteVerb::SET, 'permission' => [ 'module' => Controller::NAME, @@ -104,7 +104,7 @@ return [ ], ], [ - 'dest' => '\Modules\FleetManagement\Controller\ApiDriverController:apiNoteEdit', + 'dest' => '\Modules\FleetManagement\Controller\ApiDriverController:apiNoteUpdate', 'verb' => RouteVerb::SET, 'permission' => [ 'module' => Controller::NAME, diff --git a/Controller/ApiDriverController.php b/Controller/ApiDriverController.php index d3b872e..a02bc67 100644 --- a/Controller/ApiDriverController.php +++ b/Controller/ApiDriverController.php @@ -657,7 +657,7 @@ final class ApiDriverController extends Controller * * @since 1.0.0 */ - public function apiNoteEdit(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void + public function apiNoteUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void { $this->app->moduleManager->get('Editor', 'Api')->apiEditorUpdate($request, $response, $data); diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php index f366833..0091863 100644 --- a/tests/Controller/Api/ApiControllerAttributeTrait.php +++ b/tests/Controller/Api/ApiControllerAttributeTrait.php @@ -148,7 +148,7 @@ trait ApiControllerAttributeTrait $request = new HttpRequest(new HttpUri('')); $request->header->account = 1; - $request->setData('item', '1'); + $request->setData('ref', '1'); $request->setData('value', '1'); $request->setData('type', '1'); diff --git a/tests/Controller/Api/ApiControllerVehicleTrait.php b/tests/Controller/Api/ApiControllerVehicleTrait.php new file mode 100644 index 0000000..8c62084 --- /dev/null +++ b/tests/Controller/Api/ApiControllerVehicleTrait.php @@ -0,0 +1,53 @@ +execute(); + $vehicleTypeCount = \count($vehicleType); + $fuelTypeCount = FuelTypeMapper::count()->execute(); + + $response = new HttpResponse(); + $request = new HttpRequest(new HttpUri('')); + + $LOREM = \array_slice(Text::LOREM_IPSUM, 0, 25); + $LOREM_COUNT = \count($LOREM) - 1; + + $request->header->account = 1; + $request->setData('name', \ucfirst(Text::LOREM_IPSUM[\mt_rand(0, $LOREM_COUNT - 1)])); + $request->setData('type', \mt_rand(1, $vehicleTypeCount)); + $request->setData('fuel', \mt_rand(1, $fuelTypeCount)); + $request->setData('status', 1); + + $this->module->apiVehicleCreate($request, $response); + self::assertGreaterThan(0, $response->get('')['response']->id); + } +} diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 59609bf..4f2ac37 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -16,6 +16,7 @@ namespace Modules\FleetManagement\tests\Controller; use Model\CoreSettings; use Modules\Admin\Models\AccountPermission; +use Modules\FleetManagement\tests\Controller\Api\ApiControllerVehicleTrait; use Modules\FleetManagement\tests\Controller\Api\ApiControllerAttributeTrait; use phpOMS\Account\Account; use phpOMS\Account\AccountManager; @@ -86,12 +87,13 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->app->accountManager->add($account); $this->app->router = new WebRouter(); - $this->module = $this->app->moduleManager->get('FleetManagement', 'Api'); + $this->module = $this->app->moduleManager->get('FleetManagement', 'ApiVehicle'); $this->attrModule = $this->app->moduleManager->get('FleetManagement', 'ApiVehicleAttribute'); TestUtils::setMember($this->module, 'app', $this->app); TestUtils::setMember($this->attrModule, 'app', $this->app); } + use ApiControllerVehicleTrait; use ApiControllerAttributeTrait; }