From bb0dea0c136766113ad7ddcfe8d6e161de25e542 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 3 Jul 2021 14:37:06 +1000
Subject: [PATCH] Fixes for tess

---
 tests/Feature/ReverseInvoiceTest.php | 10 +++++-----
 tests/MockAccountData.php            |  3 ++-
 tests/Unit/GeneratesCounterTest.php  | 21 +++++++++++----------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/Feature/ReverseInvoiceTest.php b/tests/Feature/ReverseInvoiceTest.php
index e39afbbacd2f..cfc9b58b0305 100644
--- a/tests/Feature/ReverseInvoiceTest.php
+++ b/tests/Feature/ReverseInvoiceTest.php
@@ -137,9 +137,9 @@ class ReverseInvoiceTest extends TestCase
 
         $this->invoice = $this->invoice->service()->markPaid()->save();
 
-        $this->assertEquals($this->client->balance, ($this->invoice->balance * -1));
-        $this->assertEquals($this->client->paid_to_date, ($client_paid_to_date + $invoice_balance));
-        $this->assertEquals(0, $this->invoice->balance);
+        $this->assertEquals($this->client->fresh()->balance, ($this->invoice->balance * -1));
+        $this->assertEquals($this->client->fresh()->paid_to_date, ($client_paid_to_date + $invoice_balance));
+        $this->assertEquals(0, $this->invoice->fresh()->balance);
         $this->assertEquals(Invoice::STATUS_PAID, $this->invoice->status_id);
 
         $this->invoice = $this->invoice->service()->handleReversal()->save();
@@ -163,7 +163,7 @@ class ReverseInvoiceTest extends TestCase
 
         $this->assertEquals(Invoice::STATUS_REVERSED, $this->invoice->status_id);
         $this->assertEquals(0, $this->invoice->balance);
-        $this->assertEquals($this->client->paid_to_date, ($client_paid_to_date));
-        $this->assertEquals($this->client->balance, ($client_balance - $invoice_balance));
+        $this->assertEquals($this->client->fresh()->paid_to_date, ($client_paid_to_date));
+        $this->assertEquals($this->client->fresh()->balance, ($client_balance - $invoice_balance));
     }
 }
diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php
index ba545517e5c3..28832098fdc1 100644
--- a/tests/MockAccountData.php
+++ b/tests/MockAccountData.php
@@ -350,7 +350,8 @@ trait MockAccountData
                 'invoice_id' => $this->invoice->id,
             ]);
 
-        $this->invoice->service()->markSent();
+        $this->invoice->fresh()->service()->markSent();
+        // $this->invoice->service()->markSent();
 
         $this->quote = Quote::factory()->create([
                 'user_id' => $user_id,
diff --git a/tests/Unit/GeneratesCounterTest.php b/tests/Unit/GeneratesCounterTest.php
index f45f9f245853..df24792e025c 100644
--- a/tests/Unit/GeneratesCounterTest.php
+++ b/tests/Unit/GeneratesCounterTest.php
@@ -172,13 +172,14 @@ class GeneratesCounterTest extends TestCase
 
     public function testInvoiceNumberValue()
     {
-        $invoice_number = $this->getNextInvoiceNumber($this->client, $this->invoice);
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
+
+        $this->assertEquals($invoice_number, '0007');
+
+        $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
 
         $this->assertEquals($invoice_number, '0008');
-
-        $invoice_number = $this->getNextInvoiceNumber($this->client, $this->invoice);
-
-        $this->assertEquals($invoice_number, '0009');
     }
 
     public function testQuoteNumberValue()
@@ -335,13 +336,13 @@ class GeneratesCounterTest extends TestCase
         $cliz->settings = ClientSettings::defaults();
         $cliz->save();
 
-        $invoice_number = $this->getNextInvoiceNumber($cliz, $this->invoice);
+        $invoice_number = $this->getNextInvoiceNumber($cliz->fresh(), $this->invoice);
+
+        $this->assertEquals($invoice_number, '0007');
+
+        $invoice_number = $this->getNextInvoiceNumber($cliz->fresh(), $this->invoice);
 
         $this->assertEquals($invoice_number, '0008');
-
-        $invoice_number = $this->getNextInvoiceNumber($cliz, $this->invoice);
-
-        $this->assertEquals($invoice_number, '0009');
     }
 
     public function testClientNumber()