Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for tests

Browse Source
This commit is contained in:
David Bomba 2021-05-30 21:37:34 +10:00
parent b72217d74c
commit d837ca97e9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
database/migrations/2021_05_30_100933_make_documents_assigned_user_nullable.php
View File

@ -1,5 +1,6 @@
<?php <?php
use App\Libraries\MultiDB;
use App\Models\Document; use App\Models\Document;
use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
@ -21,8 +22,9 @@ class MakeDocumentsAssignedUserNullable extends Migration
Document::where('assigned_user_id', 0)->update(['assigned_user_id' => null]); Document::where('assigned_user_id', 0)->update(['assigned_user_id' => null]);
if(config('ninja.db.multi_db_enabled')){ if(config('ninja.db.multi_db_enabled')){
Document::on('db-ninja-01')->where('assigned_user_id', 0)->update(['assigned_user_id' => null]); foreach (MultiDB::$dbs as $db) {
Document::on('db-ninja-02')->where('assigned_user_id', 0)->update(['assigned_user_id' => null]); Document::on($db)->where('assigned_user_id', 0)->update(['assigned_user_id' => null]);
}
} }
else{ else{
Document::where('assigned_user_id', 0)->update(['assigned_user_id' => null]); Document::where('assigned_user_id', 0)->update(['assigned_user_id' => null]);

2
tests/Feature/Import/ImportCompanyTest.php
View File

@ -48,6 +48,7 @@ use App\Models\User;
use App\Models\Vendor; use App\Models\Vendor;
use App\Models\VendorContact; use App\Models\VendorContact;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Routing\Middleware\ThrottleRequests; use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -63,6 +64,7 @@ use Tests\TestCase;
class ImportCompanyTest extends TestCase class ImportCompanyTest extends TestCase
{ {
use MakesHash; use MakesHash;
use DatabaseTransactions;
public $account; public $account;
public $company; public $company;