From 4e4d134230440b5f83c5d7c9eba6680f42ce11dd Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 2 Jun 2019 16:36:31 +1000
Subject: [PATCH] Fixes for tests - new implementation for invitations

---
 app/Factory/InvoiceInvitationFactory.php |  2 +-
 composer.json                            |  2 +-
 tests/Feature/ClientTest.php             |  6 ++----
 tests/Feature/InvitationTest.php         | 21 ++++++---------------
 tests/Unit/CompareObjectTest.php         |  1 -
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/Factory/InvoiceInvitationFactory.php b/app/Factory/InvoiceInvitationFactory.php
index 3156cc451ee5..580a2e918a75 100644
--- a/app/Factory/InvoiceInvitationFactory.php
+++ b/app/Factory/InvoiceInvitationFactory.php
@@ -1,4 +1,4 @@
- <?php
+<?php
 /**
  * Invoice Ninja (https://invoiceninja.com)
  *
diff --git a/composer.json b/composer.json
index da01db800f01..f5df88908229 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
         "beyondcode/laravel-dump-server": "^1.0",
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
-        "laravel/dusk": "^4.0",
+        "laravel/dusk": "^5.0",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",
         "phpunit/phpunit": "^7.0"
diff --git a/tests/Feature/ClientTest.php b/tests/Feature/ClientTest.php
index 37e7434ff805..9413c5b71c78 100644
--- a/tests/Feature/ClientTest.php
+++ b/tests/Feature/ClientTest.php
@@ -226,7 +226,7 @@ class ClientTest extends TestCase
                     'user_id' => $user->id,
                     'client_id' => $c->id,
                     'company_id' => $company->id,
-                    'is_primary' => 1
+                    'is_primary' => 1,
                 ]);
 
                 factory(\App\Models\ClientContact::class,2)->create([
@@ -247,10 +247,8 @@ class ClientTest extends TestCase
             /* Make sure we are harvesting valid data */
             $this->assertEquals($client->timezone()->name, 'US/Eastern');
 
-            $contacts = ClientContact::whereIn('id', explode(',', $client->getMergedSettings()->invoice_email_list))->get();
-
             /* Make sure NULL settings return the correct count (0) instead of throwing an exception*/
-            $this->assertEquals(count($contacts), 0);
+            $this->assertEquals($client->contacts->count(), 3);
         }
 
 }
diff --git a/tests/Feature/InvitationTest.php b/tests/Feature/InvitationTest.php
index 2eff177e901a..947b2c882316 100644
--- a/tests/Feature/InvitationTest.php
+++ b/tests/Feature/InvitationTest.php
@@ -5,6 +5,7 @@ namespace Feature;
 use App\DataMapper\ClientSettings;
 use App\DataMapper\DefaultSettings;
 use App\Events\Invoice\InvoiceWasMarkedSent;
+use App\Factory\InvoiceInvitationFactory;
 use App\Jobs\Account\CreateAccount;
 use App\Listeners\Invoice\CreateInvoiceInvitations;
 use App\Models\Account;
@@ -108,23 +109,13 @@ class InvitationTest extends TestCase
         $this->assertNotNull($invoice->client);
         $this->assertNotNull($invoice->client->primary_contact);
 
-        $arr[] = $invoice->client->primary_contact->first()->id;
 
-        $settings = $invoice->settings;
-        $settings->invoice_email_list = implode(",",$arr);
+        $i = InvoiceInvitationFactory::create($invoice->company_id, $invoice->user_id);
+        $i->client_contact_id = $client->primary_contact->first()->id;
+        $i->invoice_id = $invoice->id;
+        $i->save();
 
-        $invoice->settings = $settings;
-        $invoice->save();
-
- 		$listener = new CreateInvoiceInvitations();
-
-        $listener->handle(new InvoiceWasMarkedSent($invoice));
-
-        $i = InvoiceInvitation::whereClientContactId($invoice->client->primary_contact->first()->id)->whereInvoiceId($invoice->id)->first();
-
-        $this->assertNotNull($i);
+        $this->assertNotNull($invoice->invitations);
         
-        $this->assertEquals($i->invoice_id, $invoice->id);
-
     }
 }
diff --git a/tests/Unit/CompareObjectTest.php b/tests/Unit/CompareObjectTest.php
index 4975439380bf..cfbf890b462a 100644
--- a/tests/Unit/CompareObjectTest.php
+++ b/tests/Unit/CompareObjectTest.php
@@ -59,7 +59,6 @@ class CompareObjectTest extends TestCase
 		$this->assertEquals($settings->currency_id, 1);
 		$this->assertEquals($settings->language_id, 1);
 		$this->assertEquals($settings->payment_terms, 7);
-		$this->assertTrue(property_exists($settings, 'invoice_email_list'));
 		$this->assertEquals($settings->custom_taxes1, 'FALSE');
 	}