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

fixes for company tests

Browse Source
This commit is contained in:
David Bomba 2019-06-25 15:08:07 +10:00
parent de4e3f5655
commit 220bedf3a0
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/AccountController.php
View File

@ -14,9 +14,7 @@ namespace App\Http\Controllers;
use App\Http\Requests\Account\CreateAccountRequest; use App\Http\Requests\Account\CreateAccountRequest;
use App\Jobs\Account\CreateAccount; use App\Jobs\Account\CreateAccount;
use App\Models\Account; use App\Models\Account;
use App\Models\CompanyUser;
use App\Transformers\AccountTransformer; use App\Transformers\AccountTransformer;
use App\Transformers\CompanyUserTransformer;
use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
@ -68,10 +66,9 @@ class AccountController extends BaseController
$account = CreateAccount::dispatchNow($request->all()); $account = CreateAccount::dispatchNow($request->all());
$this->entity_type = CompanyUser::class; $account->load('company_users');
$this->entity_transformer = CompanyUserTransformer::class;
return $this->itemResponse($account);
return $this->listResponse($account->default_company->users);
} }

12
app/Http/Controllers/BaseController.php
View File

@ -36,6 +36,14 @@ class BaseController extends Controller
*/ */
public $forced_includes; public $forced_includes;
/**
* Passed from the parent when we need to force
* the key of the response object
* @var string
*/
public $forced_index;
/** /**
* Fractal manager * Fractal manager
* @var object * @var object
@ -50,6 +58,8 @@ class BaseController extends Controller
$this->forced_includes = []; $this->forced_includes = [];
$this->forced_index = 'data';
} }
private function buildManager() private function buildManager()
@ -152,7 +162,7 @@ class BaseController extends Controller
protected function response($response) protected function response($response)
{ {
$index = request()->input('index') ?: 'data'; $index = request()->input('index') ?: $this->forced_index;
if ($index == 'none') { if ($index == 'none') {
unset($response['meta']); unset($response['meta']);

1
app/Http/Controllers/CompanyController.php
View File

@ -20,6 +20,7 @@ use App\Http\Requests\Company\StoreCompanyRequest;
use App\Http\Requests\Company\UpdateCompanyRequest; use App\Http\Requests\Company\UpdateCompanyRequest;
use App\Http\Requests\SignupRequest; use App\Http\Requests\SignupRequest;
use App\Jobs\Company\CreateCompany; use App\Jobs\Company\CreateCompany;
use App\Jobs\Company\CreateCompanyToken;
use App\Jobs\RegisterNewAccount; use App\Jobs\RegisterNewAccount;
use App\Models\Company; use App\Models\Company;
use App\Repositories\CompanyRepository; use App\Repositories\CompanyRepository;

6
tests/Feature/CompanyTest.php
View File

@ -4,6 +4,7 @@ namespace Tests\Feature;
use App\Models\Account; use App\Models\Account;
use App\Models\Company; use App\Models\Company;
use App\Models\CompanyToken;
use App\Models\Product; use App\Models\Product;
use App\Models\User; use App\Models\User;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
@ -83,12 +84,11 @@ class CompanyTest extends TestCase
'name' => 'A New Company' 'name' => 'A New Company'
] ]
) )
->assertStatus(200)->decodeResponseJson(); ->assertStatus(200)->decodeResponseJson();
$company = Company::find($this->decodePrimaryKey($response['data']['id'])); $company = Company::find($this->decodePrimaryKey($response['data']['id']));
Log::error('coco'); $token = CompanyToken::whereCompanyId($company->id)->first()->token;
Log::error($company);
$company_update = [ $company_update = [
'name' => 'CHANGE NAME' 'name' => 'CHANGE NAME'