From cc55cdc1b5f90623ff0472883d966e9f9cf2c503 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 7 Jun 2016 17:29:26 +0300 Subject: [PATCH] Working on tests --- app/Http/Requests/InvoiceRequest.php | 4 +++- tests/acceptance/CheckBalanceCest.php | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/InvoiceRequest.php b/app/Http/Requests/InvoiceRequest.php index edf43203c695..88366937e91f 100644 --- a/app/Http/Requests/InvoiceRequest.php +++ b/app/Http/Requests/InvoiceRequest.php @@ -10,6 +10,7 @@ class InvoiceRequest extends EntityRequest { { $invoice = parent::entity(); + /* // support loading an invoice by its invoice number if ($this->invoice_number && ! $invoice) { $invoice = Invoice::scope() @@ -17,7 +18,8 @@ class InvoiceRequest extends EntityRequest { ->withTrashed() ->firstOrFail(); } - + */ + // eager load the invoice items if ($invoice && ! $invoice->relationLoaded('invoice_items')) { $invoice->load('invoice_items'); diff --git a/tests/acceptance/CheckBalanceCest.php b/tests/acceptance/CheckBalanceCest.php index 6d37f01c98bc..2dfa8e7f35a8 100644 --- a/tests/acceptance/CheckBalanceCest.php +++ b/tests/acceptance/CheckBalanceCest.php @@ -68,7 +68,7 @@ class CheckBalanceCest $I->see('Paid to Date $' . ($productPrice * 2)); // archive the invoice - $I->amOnPage('/invoices/' . $invoiceId . '/edit'); + $I->amOnPage('/invoices/' . $invoiceId); $I->executeJS('submitBulkAction("archive")'); $I->wait(1); $I->amOnPage("/clients/{$clientId}"); @@ -76,7 +76,7 @@ class CheckBalanceCest $I->see('Paid to Date $' . ($productPrice * 2)); // delete the invoice - $I->amOnPage('/invoices/' . $invoiceId . '/edit'); + $I->amOnPage('/invoices/' . $invoiceId); $I->executeJS('submitBulkAction("delete")'); $I->wait(1); $I->amOnPage("/clients/{$clientId}"); @@ -84,7 +84,7 @@ class CheckBalanceCest $I->see('Paid to Date $0.00'); // restore the invoice - $I->amOnPage('/invoices/' . $invoiceId . '/edit'); + $I->amOnPage('/invoices/' . $invoiceId); $I->executeJS('submitBulkAction("restore")'); $I->wait(1); $I->amOnPage("/clients/{$clientId}");