Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

FIxes for tests

Browse Source
This commit is contained in:
David Bomba 2020-06-22 13:07:58 +10:00
parent 6b7db63e66
commit c2211bf2f0
5 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/Exceptions/Handler.php
View File

@ -57,25 +57,29 @@ class Handler extends ExceptionHandler
*/ */
public function report(Exception $exception) public function report(Exception $exception)
{ {
if(!Schema::hasTable('accounts')) if(!Schema::hasTable('accounts')){
info("account table not found");
return; return;
}
if (app()->bound('sentry') && $this->shouldReport($exception)) { if (app()->bound('sentry') && $this->shouldReport($exception)) {
app('sentry')->configureScope(function (Scope $scope): void {
if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) { // app('sentry')->configureScope(function (Scope $scope): void {
$scope->setUser([
'id' => auth()->guard('contact')->user()->company->account->key, // if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) {
'email' => "anonymous@example.com", // $scope->setUser([
'name' => "Anonymous User", // 'id' => auth()->guard('contact')->user()->company->account->key,
]); // 'email' => "anonymous@example.com",
} elseif (auth()->guard('user')->user() && auth()->user()->company() && auth()->user()->company()->account->report_errors) { // 'name' => "Anonymous User",
$scope->setUser([ // ]);
'id' => auth()->user()->account->key, // } elseif (auth()->guard('user') && auth()->guard('user')->user() && auth()->user()->company() && auth()->user()->company()->account->report_errors) {
'email' => "anonymous@example.com", // $scope->setUser([
'name' => "Anonymous User", // 'id' => auth()->user()->account->key,
]); // 'email' => "anonymous@example.com",
} // 'name' => "Anonymous User",
}); // ]);
// }
// });
app('sentry')->captureException($exception); app('sentry')->captureException($exception);
} }

2
app/Http/Controllers/DesignController.php
View File

@ -484,7 +484,7 @@ class DesignController extends BaseController
$designs->each(function ($design, $key) use ($action) { $designs->each(function ($design, $key) use ($action) {
if (auth()->user()->can('edit', $design)) { if (auth()->user()->can('edit', $design)) {
$this->design_repo->{$action}($design);@todo $this->design_repo->{$action}($design);
} }
}); });

2
app/Http/Requests/Payment/StorePaymentRequest.php
View File

@ -76,6 +76,8 @@ class StorePaymentRequest extends Request
$input['is_manual'] = true; $input['is_manual'] = true;
info(print_r($input,1));
$this->replace($input); $this->replace($input);
} }

2
app/Transformers/PaymentTransformer.php
View File

@ -23,7 +23,7 @@ class PaymentTransformer extends EntityTransformer
protected $serializer; protected $serializer;
protected $defaultIncludes = []; protected $defaultIncludes = ['invoices'];
protected $availableIncludes = [ protected $availableIncludes = [
'client', 'client',

5
tests/Feature/PaymentTest.php
View File

@ -191,7 +191,7 @@ class PaymentTest extends TestCase
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $this->token,
])->post('/api/v1/payments?include=invoices', $data); ])->post('/api/v1/payments?include=invoices,paymentables', $data);
} catch (ValidationException $e) { } catch (ValidationException $e) {
$message = json_decode($e->validator->getMessageBag(), 1); $message = json_decode($e->validator->getMessageBag(), 1);
$this->assertNotNull($message); $this->assertNotNull($message);
@ -204,6 +204,7 @@ class PaymentTest extends TestCase
$payment_id = $arr['data']['id']; $payment_id = $arr['data']['id'];
$payment = Payment::find($this->decodePrimaryKey($payment_id))->first(); $payment = Payment::find($this->decodePrimaryKey($payment_id))->first();
$payment->load('invoices');
$this->assertNotNull($payment); $this->assertNotNull($payment);
$this->assertNotNull($payment->invoices()); $this->assertNotNull($payment->invoices());
@ -663,7 +664,7 @@ class PaymentTest extends TestCase
} }
if ($response) { if ($response) {
$response->assertStatus(302); $response->assertStatus(200);
} }
} }