test case issue fixes

visualbuilder · Mar 4, 2024 · 1113eee · 1113eee
1 parent 2f96059
commit 1113eee
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 2 deletions.
diff --git a/config/filament-user-consent.php b/config/filament-user-consent.php
@@ -13,6 +13,8 @@
         App\Models\EndUser::class,
     ],
 
+    'auth-guards' => 'web',
+
     'options' => [
         'App\Models\Admin' => 'Admin',
         'App\Models\Practitioner' => 'Practitioner',

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -27,6 +27,16 @@
             <clover outputFile="build/logs/clover.xml"/>
         </report>
     </coverage>
+    <php>
+        <env name="APP_KEY" value="base64:NDNkbDNneml1Y2IxbTgwZnFnM3J4b3czMGhrZG0xdXo="/>
+        <env name="APP_ENV" value="testing"/>
+        <env name="BCRYPT_ROUNDS" value="4"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="MAIL_MAILER" value="array"/>
+        <env name="QUEUE_CONNECTION" value="sync"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="TELESCOPE_ENABLED" value="false"/>
+    </php>
     <logging>
         <junit outputFile="build/report.junit.xml"/>
     </logging>

diff --git a/routes/web.php b/routes/web.php
@@ -14,8 +14,7 @@
     StartSession::class,
     VerifyCsrfToken::class,
     AuthenticateSession::class,
-    Authenticate::class,
-    'auth:admin,practitioner,enduser'
+    'auth:'.config('filament-user-consent.auth-gurads'),
 ])->group(function () {
     Route::get('consent-option-request', ConsentOptionFormBuilder::class)->name('consent-option-request');
 });
diff --git a/src/Http/Middleware/ForceRedirectToUnapprovedConsents.php b/src/Http/Middleware/ForceRedirectToUnapprovedConsents.php
@@ -18,6 +18,8 @@ public function handle(Request $request, Closure $next)
             return $next($request);
         }
 
+
+
         // Determine if the current route is exempt (a consent route or ends with '.logout')
         $route = $request->route()->getName();
         $isExemptRoute = str_contains($route, 'consent-options') || str_ends_with($route, '.logout');

diff --git a/tests/RequestTest.php b/tests/RequestTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Visualbuilder\FilamentUserConsent\Models\ConsentOption;
 use Visualbuilder\FilamentUserConsent\Tests\Seeders\ConsentOptionSeeder;
 
 use function Pest\Laravel\get;

diff --git a/tests/Seeders/ConsentOptionSeeder.php b/tests/Seeders/ConsentOptionSeeder.php
@@ -114,6 +114,34 @@ public function run()
 </p>',
           'is_mandatory' => true,
           'is_current'   => true,
+          'additional_info' => true,
+          'additional_info_title' => "Contract additiona info",
+          'fields' => [
+            [
+              "name" => "name",
+              "type" => "text",
+              "label" => "Emergency Contact Name",
+              "rules" => "",
+              "options" => "",
+              "required" => true
+            ],
+            [
+              "name" => "position",
+              "type" => "text",
+              "label" => "Emergency Contact Position",
+              "rules" => "",
+              "options" => "",
+              "required" => false
+            ],
+            [
+              "name" => "phone",
+              "type" => "text",
+              "label" => "Emergency Contact Telephone",
+              "rules" => "",
+              "options" => "",
+              "required" => true
+            ]
+          ],
           'models'       => [
             [
               'Visualbuilder\FilamentUserConsent\Tests\Models\User' => 'User'
@@ -152,6 +180,7 @@ public function run()
 </ol>',
           'is_mandatory' => true,
           'is_current'   => true,
+          'additional_info' => false,
           'models'       => [
             [
               'Visualbuilder\FilamentUserConsent\Tests\Models\User' => 'User'