mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-27 19:57:10 +02:00
Merge branch 'v5-develop' into v5-stable
This commit is contained in:
commit
de36985d6f
@ -12,6 +12,8 @@
|
|||||||
|
|
||||||
namespace Tests\Feature\ClientPortal;
|
namespace Tests\Feature\ClientPortal;
|
||||||
|
|
||||||
|
use App\DataMapper\ClientSettings;
|
||||||
|
use App\DataMapper\CompanySettings;
|
||||||
use App\Http\Livewire\CreditsTable;
|
use App\Http\Livewire\CreditsTable;
|
||||||
use App\Models\Account;
|
use App\Models\Account;
|
||||||
use App\Models\Client;
|
use App\Models\Client;
|
||||||
@ -19,6 +21,7 @@ use App\Models\ClientContact;
|
|||||||
use App\Models\Company;
|
use App\Models\Company;
|
||||||
use App\Models\Credit;
|
use App\Models\Credit;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
use App\Utils\Traits\AppSetup;
|
||||||
use Faker\Factory;
|
use Faker\Factory;
|
||||||
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
||||||
use Livewire\Livewire;
|
use Livewire\Livewire;
|
||||||
@ -28,12 +31,14 @@ use function now;
|
|||||||
class CreditsTest extends TestCase
|
class CreditsTest extends TestCase
|
||||||
{
|
{
|
||||||
use DatabaseTransactions;
|
use DatabaseTransactions;
|
||||||
|
use AppSetup;
|
||||||
|
|
||||||
public function setUp(): void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
$this->faker = Factory::create();
|
$this->faker = Factory::create();
|
||||||
|
$this->buildCache(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testShowingOnlyCreditsWithDueDateLessOrEqualToNow()
|
public function testShowingOnlyCreditsWithDueDateLessOrEqualToNow()
|
||||||
@ -45,8 +50,12 @@ class CreditsTest extends TestCase
|
|||||||
);
|
);
|
||||||
|
|
||||||
$company = Company::factory()->create(['account_id' => $account->id]);
|
$company = Company::factory()->create(['account_id' => $account->id]);
|
||||||
|
$company->settings = CompanySettings::defaults();
|
||||||
|
$company->save();
|
||||||
|
|
||||||
$client = Client::factory()->create(['company_id' => $company->id, 'user_id' => $user->id]);
|
$client = Client::factory()->create(['company_id' => $company->id, 'user_id' => $user->id]);
|
||||||
|
$client->settings = ClientSettings::defaults();
|
||||||
|
$client->save();
|
||||||
|
|
||||||
ClientContact::factory()->count(2)->create([
|
ClientContact::factory()->count(2)->create([
|
||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
|
@ -20,6 +20,7 @@ use App\Models\ClientContact;
|
|||||||
use App\Models\Company;
|
use App\Models\Company;
|
||||||
use App\Models\Invoice;
|
use App\Models\Invoice;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
use App\Utils\Traits\AppSetup;
|
||||||
use Faker\Factory;
|
use Faker\Factory;
|
||||||
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
use Illuminate\Foundation\Testing\DatabaseTransactions;
|
||||||
use Livewire\Livewire;
|
use Livewire\Livewire;
|
||||||
@ -28,12 +29,15 @@ use Tests\TestCase;
|
|||||||
class InvoicesTest extends TestCase
|
class InvoicesTest extends TestCase
|
||||||
{
|
{
|
||||||
use DatabaseTransactions;
|
use DatabaseTransactions;
|
||||||
|
use AppSetup;
|
||||||
|
|
||||||
public function setUp(): void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
$this->faker = Factory::create();
|
$this->faker = Factory::create();
|
||||||
|
$this->buildCache(true);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testInvoiceTableFilters()
|
public function testInvoiceTableFilters()
|
||||||
|
Loading…
Reference in New Issue
Block a user