From 8ad509d7f1983ae0403f0991573b949cf65211d8 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 15 Dec 2016 15:24:55 -0800 Subject: [PATCH] Update validation in AssetRequest form request --- app/Http/Requests/AssetRequest.php | 14 +++++++------- tests/functional/AssetsCest.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Http/Requests/AssetRequest.php b/app/Http/Requests/AssetRequest.php index a4bdcb816..1ebe03e7a 100644 --- a/app/Http/Requests/AssetRequest.php +++ b/app/Http/Requests/AssetRequest.php @@ -29,16 +29,16 @@ class AssetRequest extends Request 'name' => 'min:2|max:255', 'model_id' => 'required|integer', 'status_id' => 'required|integer', - 'company_id' => 'integer', - 'warranty_months' => 'integer|min:0|max:240', - 'physical' => 'integer', + 'company_id' => 'integer|nullable', + 'warranty_months' => 'numeric|nullable', + 'physical' => 'integer|nullable', 'checkout_date' => 'date', 'checkin_date' => 'date', - 'supplier_id' => 'integer', - 'status' => 'integer', + 'supplier_id' => 'integer|nullable', + 'status' => 'integer|nullable', 'asset_tag' => 'required', - 'purchase_cost' => 'numeric', - + 'purchase_cost' => 'numeric|nullable', + ]; $model = AssetModel::find($this->request->get('model_id')); diff --git a/tests/functional/AssetsCest.php b/tests/functional/AssetsCest.php index 59f5d5e7f..59bf2aaf3 100644 --- a/tests/functional/AssetsCest.php +++ b/tests/functional/AssetsCest.php @@ -51,7 +51,7 @@ class AssetsCest 'rtd_location_id' => $asset->rtd_location_id, 'requestable' => $asset->requestable, ]; - ///print_r($values); + $I->wantTo("Test Validation Succeeds"); $I->amOnPage(route('hardware.create')); $I->submitForm('form#create-form', $values);