Fix conflit

This commit is contained in:
Too
2018-06-19 02:52:21 +08:00
20 changed files with 792 additions and 508 deletions
+11 -2
View File
@@ -71,7 +71,7 @@ class BookingTest extends TestCase
public function testuploadbankslip()
{
Storage::fake('bankslip_url');
Storage::fake('file');
$bankslip_url = UploadedFile::fake()->image('comp.jpg');
if(!file_exists($bankslip_url)){
@@ -80,12 +80,21 @@ class BookingTest extends TestCase
$this->actingAs($this->user)
->json('POST', '/api/booking/' . $this->booking->id . '/upload-user-bankslip', [
'bankslip_url' => $bankslip_url,
'bankslip_url' => $bankslip_url
])
->assertSuccessful();
}
public function testUpdateBankslipAmount()
{
$this->actingAs($this->user)
->json('PUT', '/api/booking/' . $this->booking->id . '/bankslip-amount', [
'transfer_amount' => '9000'
])
->assertSuccessful();
}
public function testuploadPO()
{
Storage::fake('image_url');