From ef9aff6868409974c9b0fc5eb82a8562e5482465 Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Wed, 30 May 2018 11:05:01 +0800 Subject: [PATCH] testing --- .../WarehousearrangementController.php | 5 +- ...op_foreign_key_in_warehouseitems_table.php | 35 +++++++ routes/api.php | 2 +- tests/Feature/ExampleTest.php | 21 ----- tests/Unit/ExampleTest.php | 19 ---- tests/Unit/WarehouseReceiveNoteTest.php | 92 +++++++++++++++++++ 6 files changed, 129 insertions(+), 45 deletions(-) create mode 100644 database/migrations/2018_05_30_015110_drop_foreign_key_in_warehouseitems_table.php delete mode 100644 tests/Feature/ExampleTest.php delete mode 100644 tests/Unit/ExampleTest.php create mode 100644 tests/Unit/WarehouseReceiveNoteTest.php diff --git a/app/Http/Controllers/WarehousearrangementController.php b/app/Http/Controllers/WarehousearrangementController.php index 3635c95..4a78d60 100644 --- a/app/Http/Controllers/WarehousearrangementController.php +++ b/app/Http/Controllers/WarehousearrangementController.php @@ -9,7 +9,6 @@ use App\Warehouseitem; use App\Decision; use App\Decisionitem; use Validator; -use DB; class WarehousearrangementController extends Controller { @@ -43,7 +42,7 @@ class WarehousearrangementController extends Controller $warehousearr->image = $request->input('image'); $warehousearr->save(); - //store warehouse receive note item + //store warehouse receive note item $warehouseitems = $request->input("warehouseitem"); foreach ($warehouseitems as $warehouseitem) { @@ -99,7 +98,6 @@ class WarehousearrangementController extends Controller foreach ($warehouseitems as $warehouseitem) { $ex_warehouseitem = Warehouseitem::where('wa_id', $id)->first(); - //return $ex_warehouseitem; $ex_warehouseitem->description = $warehouseitem['description']; $ex_warehouseitem->nominal_ctn = $warehouseitem['nominal_ctn']; @@ -245,7 +243,6 @@ class WarehousearrangementController extends Controller return response()->json(['decisionitem'=>$decisionitem], 201); } - //need to do the put, delete, for the all post /** * Display the specified resource. diff --git a/database/migrations/2018_05_30_015110_drop_foreign_key_in_warehouseitems_table.php b/database/migrations/2018_05_30_015110_drop_foreign_key_in_warehouseitems_table.php new file mode 100644 index 0000000..f2fe981 --- /dev/null +++ b/database/migrations/2018_05_30_015110_drop_foreign_key_in_warehouseitems_table.php @@ -0,0 +1,35 @@ +dropColumn('soitem_id'); + // $table->dropForeign('warehouseitems_soitem_id_foreign'); + + }); + } +} diff --git a/routes/api.php b/routes/api.php index 5fc0ed0..3a65d25 100644 --- a/routes/api.php +++ b/routes/api.php @@ -15,7 +15,7 @@ use Illuminate\Http\Request; //route for the Warehouse-receive-note //Route::get('/so/{so_id}','warehousearrangementController@index');//view the list of wrn -Route::get('/warehousearr/{wa_id}','WarehousearrangementController@index');//view the wrn +Route::get('/warehousearr','WarehousearrangementController@index');//view the wrn Route::post('/warehousearr','WarehousearrangementController@store');//store the new wrn Route::post('/warehousearr/warehouse_picture/{wa_id}','WarehousearrangementController@warehousearrpic');//upload warehousepicture picture diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php deleted file mode 100644 index f31e495..0000000 --- a/tests/Feature/ExampleTest.php +++ /dev/null @@ -1,21 +0,0 @@ -get('/'); - - $response->assertStatus(200); - } -} diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php deleted file mode 100644 index e9fe19c..0000000 --- a/tests/Unit/ExampleTest.php +++ /dev/null @@ -1,19 +0,0 @@ -assertTrue(true); - } -} diff --git a/tests/Unit/WarehouseReceiveNoteTest.php b/tests/Unit/WarehouseReceiveNoteTest.php new file mode 100644 index 0000000..8301aa1 --- /dev/null +++ b/tests/Unit/WarehouseReceiveNoteTest.php @@ -0,0 +1,92 @@ +json('GET', '/api/warehousearr'); + + $response->assertStatus(200); + + } + + public function testPOST() + { + $response = $this->json('POST', '/api/warehousearr', + + [ + + 'so_id'=> '3', + 'receive_on'=> '2018-03-01', + 'transport_company_name'=> 'TEScief', + 'consignment_note_no'=> '3', + 'warehouse_receive_note_no'=> '3', + 'receiving_person'=> 'TEST', + 'marking_number'=> '3', + 'image'=> 'test.jpg', + 'warehouseitem' => [ + 0 => [ + 'description'=> 'CIEFhuhuuh', + 'nominal_ctn'=> '1', + 'actual_ctn'=> '1', + 'nominal_measurement'=> '1', + 'actual_measurement'=> '1', + 'nominal_weight'=> '1', + 'actual_weight'=> '1', + 'balance'=> '2', + 'isDamaged'=> '1', + 'status'=> 'ok', + 'image'=> 'test.jpg', + 'wa_id'=> '4', + 'soitem_id'=> '4' + ], + 1 => [ + 'description'=> 'CIEFhuhuuh', + 'nominal_ctn'=> '1', + 'actual_ctn'=> '1', + 'nominal_measurement'=> '1', + 'actual_measurement'=> '1', + 'nominal_weight'=> '1', + 'actual_weight'=> '1', + 'balance'=> '2', + 'isDamaged'=> '1', + 'status'=> 'ok', + 'image'=> 'test.jpg', + 'wa_id'=> '4', + 'soitem_id'=> '4' + ] + ] + ]); + + $response->assertStatus(201); + + } + + // public function testUploadWarehouseImage() + // { + // Storage::fake('warehouse_picture'); + + // $response = $this->actingAs($this->user) + // ->json('POST', '/warehousearr/warehouse_picture/{wa_id}', [ + // 'warehouse_picture' => UploadedFile::fake()->image('comp.jpg') + // ]); + // // dd($response->getContent()); + // $response->assertStatus(201); + // } + + +} \ No newline at end of file