Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for tests

Browse Source
This commit is contained in:
Hillel Coren 2016-10-05 17:47:03 +03:00
parent acc48081e5
commit 0529f0b80b
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/invoices/edit.blade.php
View File

@ -207,11 +207,10 @@
@if ($entityType == ENTITY_INVOICE) @if ($entityType == ENTITY_INVOICE)
<div class="form-group" style="margin-bottom: 8px"> <div class="form-group" style="margin-bottom: 8px">
<div class="col-lg-8 col-sm-8 col-sm-offset-4" style="padding-top: 10px"> <div class="col-lg-8 col-sm-8 col-sm-offset-4 smaller" style="padding-top: 10px">
@if ($invoice->recurring_invoice) @if ($invoice->recurring_invoice)
{!! trans('texts.created_by_invoice', ['invoice' => link_to('/invoices/'.$invoice->recurring_invoice->public_id, trans('texts.recurring_invoice'), ['id' => 'recurringInvoiceLink'])]) !!} {!! trans('texts.created_by_invoice', ['invoice' => link_to('/invoices/'.$invoice->recurring_invoice->public_id, trans('texts.recurring_invoice'))]) !!}
@elseif ($invoice->id) @elseif ($invoice->id)
<span class="smaller">
@if (isset($lastSent) && $lastSent) @if (isset($lastSent) && $lastSent)
{!! trans('texts.last_sent_on', ['date' => link_to('/invoices/'.$lastSent->public_id, $invoice->last_sent_date, ['id' => 'lastSent'])]) !!} <br/> {!! trans('texts.last_sent_on', ['date' => link_to('/invoices/'.$lastSent->public_id, $invoice->last_sent_date, ['id' => 'lastSent'])]) !!} <br/>
@endif @endif
@ -223,7 +222,6 @@
{!! trans('texts.next_due_on', ['date' => '<span>'.$account->formatDate($invoice->getDueDate($invoice->getNextSendDate())).'</span>']) !!} {!! trans('texts.next_due_on', ['date' => '<span>'.$account->formatDate($invoice->getDueDate($invoice->getNextSendDate())).'</span>']) !!}
@endif @endif
@endif @endif
</span>
@endif @endif
</div> </div>
</div> </div>

11
tests/acceptance/InvoiceCest.php
View File

@ -15,7 +15,7 @@ class InvoiceCest
$this->faker = Factory::create(); $this->faker = Factory::create();
} }
/*
public function createInvoice(AcceptanceTester $I) public function createInvoice(AcceptanceTester $I)
{ {
$clientEmail = $this->faker->safeEmail; $clientEmail = $this->faker->safeEmail;
@ -77,7 +77,7 @@ class InvoiceCest
]); ]);
} }
} }
*/
public function createRecurringInvoice(AcceptanceTester $I) public function createRecurringInvoice(AcceptanceTester $I)
{ {
$clientEmail = $this->faker->safeEmail; $clientEmail = $this->faker->safeEmail;
@ -101,12 +101,11 @@ class InvoiceCest
$I->wait(2); $I->wait(2);
$I->see($clientEmail); $I->see($clientEmail);
$invoiceNumber = $I->grabAttributeFrom('#invoice_number', 'value'); $I->click('#lastSent');
$I->click('#recurringInvoiceLink');
$I->see($clientEmail); $I->see($clientEmail);
$I->click('#lastSent'); $I->click('Recurring Invoice');
$I->see($invoiceNumber); $I->see($clientEmail);
} }