From 648102cd824dae6317af757dcb66b9dae99b3cf4 Mon Sep 17 00:00:00 2001
From: Adam Weston <adam@awcodes.com>
Date: Sun, 1 Oct 2023 14:05:00 -0400
Subject: [PATCH] Fix: tests autoloader

---
 composer.json           |  3 +--
 tests/helpers.php       | 13 -------------
 tests/src/FormsTest.php | 16 +++++++---------
 3 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 tests/helpers.php

diff --git a/composer.json b/composer.json
index 811d92d..537911a 100644
--- a/composer.json
+++ b/composer.json
@@ -37,8 +37,7 @@
     },
     "autoload": {
         "files": [
-            "src/helpers.php",
-            "tests/helpers.php"
+            "src/helpers.php"
         ],
         "psr-4": {
             "FilamentTiptapEditor\\": "src/",
diff --git a/tests/helpers.php b/tests/helpers.php
deleted file mode 100644
index 9692908..0000000
--- a/tests/helpers.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace FilamentTiptapEditor\Tests;
-
-use Livewire\Features\SupportTesting\Testable;
-use Livewire\Livewire;
-
-if (! function_exists('\FilamentTiptapEditor\Tests\livewire')) {
-    function livewire(string $component, array $props = []): Testable
-    {
-        return Livewire::test($component, $props);
-    }
-}
\ No newline at end of file
diff --git a/tests/src/FormsTest.php b/tests/src/FormsTest.php
index 6671669..d966094 100644
--- a/tests/src/FormsTest.php
+++ b/tests/src/FormsTest.php
@@ -3,17 +3,15 @@
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use FilamentTiptapEditor\Tests\Models\Page;
-use FilamentTiptapEditor\Tests\Fixtures\Livewire;
-use FilamentTiptapEditor\Tests\Resources\PageResource;
+use FilamentTiptapEditor\Tests\Fixtures\Livewire as LivewireFixture;
 use FilamentTiptapEditor\Tests\Resources\PageResource\Pages\CreatePage;
 use FilamentTiptapEditor\Tests\Resources\PageResource\Pages\EditPage;
 use FilamentTiptapEditor\TiptapEditor;
 use Illuminate\Contracts\View\View;
-
-use function FilamentTiptapEditor\Tests\livewire;
+use Livewire\Livewire;
 
 it('has editor field', function() {
-    livewire(TestComponentWithForm::class)
+    Livewire::test(TestComponentWithForm::class)
        ->assertFormFieldExists('html_content')
        ->assertFormFieldExists('json_content')
        ->assertFormFieldExists('text_content');
@@ -22,7 +20,7 @@
 it('has proper html', function() {
     $page = Page::factory()->make();
 
-    livewire(TestComponentWithForm::class)
+    Livewire::test(TestComponentWithForm::class)
         ->fillForm($page->toArray())
         ->assertFormSet([
             'html_content' => $page->html_content,
@@ -34,7 +32,7 @@
 it('creates proper data', function() {
     $page = Page::factory()->make();
 
-    livewire(CreatePage::class)
+    Livewire::test(CreatePage::class)
         ->fillForm([
             'title' => $page->title,
             'html_content' => $page->html_content,
@@ -54,7 +52,7 @@
     $page = Page::factory()->create();
     $newData = Page::factory()->make();
 
-    livewire(EditPage::class, [
+    Livewire::test(EditPage::class, [
         'record' => $page->getRouteKey(),
     ])
         ->fillForm([
@@ -70,7 +68,7 @@
         ->json_content->toBe($newData->json_content);
 });
 
-class TestComponentWithForm extends Livewire
+class TestComponentWithForm extends LivewireFixture
 {
     public function form(Form $form): Form
     {