Tests passing after merge

owen-it · Dec 15, 2023 · ea63b50 · ea63b50
1 parent 6473980
commit ea63b50
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/Concerns/GathersDataToAudit.php b/src/Concerns/GathersDataToAudit.php
@@ -167,7 +167,7 @@ protected function getAuditAttributes(): array
     protected function isAttributeAuditable(string $attribute): bool
     {
         // The attribute should not be audited
-        if (in_array($attribute, $this->excludedAttributes, true)) {
+        if (in_array($attribute, $this->resolvedExcludedAttributes, true)) {
             return false;
         }
 

diff --git a/tests/Functional/AuditingTest.php b/tests/Functional/AuditingTest.php
@@ -642,9 +642,9 @@ public function itWillAuditSync()
      */
     public function itWillAuditDetach()
     {
-        $firstCategory = factory(Category::class)->create();
-        $secondCategory = factory(Category::class)->create();
-        $article = factory(Article::class)->create();
+        $firstCategory = Category::factory()->create();
+        $secondCategory = Category::factory()->create();
+        $article = Article::factory()->create();
 
         $article->categories()->attach($firstCategory);
         $article->categories()->attach($secondCategory);
@@ -754,8 +754,8 @@ public function itWillNotAuditAttachWhenSkippingEmptyValuesAndNoChangesMade()
     {
         $this->app['config']->set('audit.empty_values', false);
 
-        $firstCategory = factory(Category::class)->create();
-        $article = factory(Article::class)->create();
+        $firstCategory = Category::factory()->create();
+        $article = Article::factory()->create();
 
         $article->categories()->attach($firstCategory);
 
@@ -781,9 +781,9 @@ public function itWillNotAuditDetachWhenSkippingEmptyValuesAndNoChangesMade()
     {
         $this->app['config']->set('audit.empty_values', false);
 
-        $firstCategory = factory(Category::class)->create();
-        $secondCategory = factory(Category::class)->create();
-        $article = factory(Article::class)->create();
+        $firstCategory = Category::factory()->create();
+        $secondCategory = Category::factory()->create();
+        $article = Article::factory()->create();
 
         $article->categories()->attach($firstCategory);
 

diff --git a/tests/Unit/AuditableObserverTest.php b/tests/Unit/AuditableObserverTest.php
@@ -2,13 +2,13 @@
 
 namespace OwenIt\Auditing\Tests\Unit;
 
-use OwenIt\Auditing\Models\Audit;
 use Illuminate\Support\Facades\Event;
 use OwenIt\Auditing\AuditableObserver;
-use OwenIt\Auditing\Tests\AuditingTestCase;
-use OwenIt\Auditing\Tests\Models\Article;
 use OwenIt\Auditing\Events\DispatchAudit;
 use OwenIt\Auditing\Events\DispatchingAudit;
+use OwenIt\Auditing\Models\Audit;
+use OwenIt\Auditing\Tests\AuditingTestCase;
+use OwenIt\Auditing\Tests\Models\Article;
 
 class AuditableObserverTest extends AuditingTestCase
 {
@@ -30,7 +30,7 @@ public function itWillCancelTheAuditDispatchingFromAnEventListener($eventMethod)
         });
 
         $observer = new AuditableObserver();
-        $model = factory(Article::class)->create();
+        $model = Article::factory()->create();
 
         $observer->$eventMethod($model);
 
@@ -49,7 +49,7 @@ public function itDispatchesTheCorrectEvents(string $eventMethod)
         Event::fake();
 
         $observer = new AuditableObserver();
-        $model = factory(Article::class)->create();
+        $model = Article::factory()->create();
 
         $observer->$eventMethod($model);
 

diff --git a/tests/Unit/ProcessDispatchAuditTest.php b/tests/Unit/ProcessDispatchAuditTest.php
@@ -2,13 +2,13 @@
 
 namespace OwenIt\Auditing\Tests\Unit;
 
+use Illuminate\Events\CallQueuedListener;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Queue;
 use OwenIt\Auditing\Events\DispatchAudit;
-use OwenIt\Auditing\Tests\Models\Article;
-use Illuminate\Events\CallQueuedListener;
-use OwenIt\Auditing\Tests\AuditingTestCase;
 use OwenIt\Auditing\Listeners\ProcessDispatchAudit;
+use OwenIt\Auditing\Tests\AuditingTestCase;
+use OwenIt\Auditing\Tests\Models\Article;
 
 class ProcessDispatchAuditTest extends AuditingTestCase
 {
@@ -36,7 +36,7 @@ public function itGetsProperlyQueued()
     {
         Queue::fake();
 
-        $model = factory(Article::class)->create();
+        $model = Article::factory()->create();
 
         DispatchAudit::dispatch($model);
 
@@ -58,7 +58,7 @@ public function itCanHaveConnectionAndQueueSet()
 
         Queue::fake();
 
-        $model = factory(Article::class)->create();
+        $model = Article::factory()->create();
 
         DispatchAudit::dispatch($model);