From 571e39d21fa6bb47ddf1780dfe0a3aa1ecd53e07 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sun, 4 Oct 2020 18:06:56 +0800 Subject: [PATCH] Some changes adopting laravel 7 --- app/Entities/Projects/Project.php | 2 +- resources/views/payments/index.blade.php | 2 +- resources/views/projects/issues/partials/comment-section.blade.php | 2 +- tests/Feature/Invoices/InvoiceEntryTest.php | 6 +++--- tests/Feature/Payments/ManagePaymentsTest.php | 4 ++-- tests/Feature/Projects/ProjectIssuesTest.php | 2 +- tests/Unit/Models/CustomerTest.php | 3 ++- tests/Unit/Models/JobTest.php | 2 +- tests/Unit/Models/ProjectTest.php | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/Entities/Projects/Project.php b/app/Entities/Projects/Project.php index 70c89d9..9834a57 100755 --- a/app/Entities/Projects/Project.php +++ b/app/Entities/Projects/Project.php @@ -36,7 +36,7 @@ class Project extends Model */ public function nameLink() { - return link_to_route('projects.show', $this->name, [$this->id], [ + return link_to_route('projects.show', $this->name, [$this], [ 'title' => trans( 'app.show_detail_title', ['name' => $this->name, 'type' => trans('project.project')] diff --git a/resources/views/payments/index.blade.php b/resources/views/payments/index.blade.php index fbc4f5b..a688596 100755 --- a/resources/views/payments/index.blade.php +++ b/resources/views/payments/index.blade.php @@ -47,7 +47,7 @@ {{ $payment->present()->amount }} {{ $payment->description }} - {!! html_link_to_route('payments.show', '', [$payment->id], ['icon' => 'search', 'class' => 'btn btn-info btn-xs', 'title' => __('app.show')]) !!} + {!! html_link_to_route('payments.show', '', [$payment->id], ['icon' => 'search', 'class' => 'btn btn-info btn-xs', 'title' => __('app.show'), 'id' => 'show_payment-'.$payment->id]) !!} {!! html_link_to_route('payments.pdf', '', [$payment->id], ['icon' => 'print', 'class' => 'btn btn-warning btn-xs', 'title' => __('app.print')]) !!} diff --git a/resources/views/projects/issues/partials/comment-section.blade.php b/resources/views/projects/issues/partials/comment-section.blade.php index 73eec00..d324c6b 100644 --- a/resources/views/projects/issues/partials/comment-section.blade.php +++ b/resources/views/projects/issues/partials/comment-section.blade.php @@ -45,7 +45,7 @@
{!! Form::submit(__('comment.update'), ['class' => 'btn btn-success']) !!} - {{ link_to_route('projects.issues.show', __('app.cancel'), [$project->issue, $issue] + request(['page']), ['class' => 'btn btn-default']) }} + {{ link_to_route('projects.issues.show', __('app.cancel'), [$project, $issue] + request(['page']), ['class' => 'btn btn-default']) }}
{!! Form::close() !!} diff --git a/tests/Feature/Invoices/InvoiceEntryTest.php b/tests/Feature/Invoices/InvoiceEntryTest.php index 214ddf0..3733013 100644 --- a/tests/Feature/Invoices/InvoiceEntryTest.php +++ b/tests/Feature/Invoices/InvoiceEntryTest.php @@ -81,9 +81,9 @@ class InvoiceEntryTest extends TestCase $this->see(trans('invoice.item_added')); - // $this->type('Testing deskripsi invoice item', 'new_item_description'); - // $this->type(3000, 'new_item_amount'); - // $this->press(trans('invoice.add_item')); + $this->type('Testing deskripsi invoice item', 'new_item_description'); + $this->type(3000, 'new_item_amount'); + $this->press(trans('invoice.add_item')); $this->seePageIs(route('invoice-drafts.show', $draft->draftKey)); $this->assertEquals(2000, $draft->getTotal()); diff --git a/tests/Feature/Payments/ManagePaymentsTest.php b/tests/Feature/Payments/ManagePaymentsTest.php index 5d1c9e0..6f5b66f 100644 --- a/tests/Feature/Payments/ManagePaymentsTest.php +++ b/tests/Feature/Payments/ManagePaymentsTest.php @@ -212,7 +212,7 @@ class ManagePaymentsTest extends TestCase $payment = factory(Payment::class)->create(); $this->visit(route('payments.index')); - $this->click($payment->number); + $this->click('show_payment-'.$payment->id); $this->seePageIs(route('payments.show', $payment->id)); $this->see(trans('payment.detail')); $this->see($payment->date); @@ -253,7 +253,7 @@ class ManagePaymentsTest extends TestCase 'in_out' => 1, 'date' => '2015-05-01', 'partner_type' => Customer::class, - 'partner_id' => $project->customer_id, + 'partner_id' => $project->customer_id, ]); } } diff --git a/tests/Feature/Projects/ProjectIssuesTest.php b/tests/Feature/Projects/ProjectIssuesTest.php index 8efdab2..bee0ae1 100644 --- a/tests/Feature/Projects/ProjectIssuesTest.php +++ b/tests/Feature/Projects/ProjectIssuesTest.php @@ -160,7 +160,7 @@ class ProjectIssuesTest extends TestCase $this->visitRoute('projects.issues.show', [$issue->project, $issue]); $this->submitForm(__('issue.update'), [ - 'pic_id' => null, + 'pic_id' => '', ]); $this->seeRouteIs('projects.issues.show', [$issue->project, $issue]); $this->seeText(__('issue.updated')); diff --git a/tests/Unit/Models/CustomerTest.php b/tests/Unit/Models/CustomerTest.php index 7ff15a4..69e5d5e 100644 --- a/tests/Unit/Models/CustomerTest.php +++ b/tests/Unit/Models/CustomerTest.php @@ -62,7 +62,8 @@ class CustomerTest extends TestCase /** @test */ public function a_customer_has_name_link_method() { - $customer = factory(Customer::class)->make(); + $customer = factory(Customer::class)->create(); + $this->assertEquals( link_to_route('customers.show', $customer->name, [$customer->id], [ 'title' => trans( diff --git a/tests/Unit/Models/JobTest.php b/tests/Unit/Models/JobTest.php index f7917fc..34379aa 100644 --- a/tests/Unit/Models/JobTest.php +++ b/tests/Unit/Models/JobTest.php @@ -22,7 +22,7 @@ class JobTest extends TestCase /** @test */ public function a_job_has_name_link_method() { - $job = factory(Job::class)->make(); + $job = factory(Job::class)->create(); $this->assertEquals( link_to_route('jobs.show', $job->name, [$job->id], [ diff --git a/tests/Unit/Models/ProjectTest.php b/tests/Unit/Models/ProjectTest.php index b87f7a0..b9dea82 100644 --- a/tests/Unit/Models/ProjectTest.php +++ b/tests/Unit/Models/ProjectTest.php @@ -23,7 +23,7 @@ class ProjectTest extends TestCase /** @test */ public function a_project_has_name_link_method() { - $project = factory(Project::class)->make(); + $project = factory(Project::class)->create(); $this->assertEquals( link_to_route('projects.show', $project->name, [$project->id], [ 'title' => trans(