From 80991208afe058beee20c09dd9d9537f1aae4099 Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@mpba.co.uk>
Date: Tue, 16 Jun 2026 23:20:37 +0100
Subject: [PATCH] tests fixing ofr modules

---
 .../Browser/HelpdeskSettingsBrowserTest.php     | 12 ++++++++++--
 .../Tests/Browser/HelpdeskTicketBrowserTest.php | 17 ++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Modules/Helpdesk/Tests/Browser/HelpdeskSettingsBrowserTest.php b/Modules/Helpdesk/Tests/Browser/HelpdeskSettingsBrowserTest.php
index f79ba98a..587a0b2a 100644
--- a/Modules/Helpdesk/Tests/Browser/HelpdeskSettingsBrowserTest.php
+++ b/Modules/Helpdesk/Tests/Browser/HelpdeskSettingsBrowserTest.php
@@ -72,13 +72,21 @@ final class HelpdeskSettingsBrowserTest extends DuskTestCase
 
     private function setHelpdeskSettingsSection(Browser $browser, string $section): void
     {
+        $encodedSection = json_encode($section, JSON_THROW_ON_ERROR);
+
         $browser->script(<<<JS
 const settings = document.querySelector('[dusk="helpdesk-settings-manager"]');
-const component = settings?.closest('[wire\\:id]');
+
+let component = settings;
+while (component && ! component.hasAttribute('wire:id')) {
+    component = component.parentElement;
+}
+
 if (! component) {
     throw new Error('Helpdesk settings Livewire component was not found.');
 }
-window.Livewire.find(component.getAttribute('wire:id')).set('section', '{$section}');
+
+window.Livewire.find(component.getAttribute('wire:id')).set('section', {$encodedSection});
 JS);
     }
 }
diff --git a/Modules/Helpdesk/Tests/Browser/HelpdeskTicketBrowserTest.php b/Modules/Helpdesk/Tests/Browser/HelpdeskTicketBrowserTest.php
index c50ca6ec..63c8eb33 100644
--- a/Modules/Helpdesk/Tests/Browser/HelpdeskTicketBrowserTest.php
+++ b/Modules/Helpdesk/Tests/Browser/HelpdeskTicketBrowserTest.php
@@ -75,14 +75,19 @@ final class HelpdeskTicketBrowserTest extends DuskTestCase
 
         $browser->script(<<<JS
 const form = document.querySelector('.helpdesk-ticket-form');
-const component = form?.closest('[wire\\:id]');
+
+let component = form;
+while (component && ! component.hasAttribute('wire:id')) {
+    component = component.parentElement;
+}
+
 if (! component) {
     throw new Error('Helpdesk ticket create Livewire component was not found.');
 }
+
 window.Livewire.find(component.getAttribute('wire:id')).set({$encodedProperty}, {$encodedValue});
 JS);
     }
-
     private function setTicketShowProperty(Browser $browser, string $property, mixed $value): void
     {
         $encodedProperty = json_encode($property, JSON_THROW_ON_ERROR);
@@ -90,10 +95,16 @@ JS);
 
         $browser->script(<<<JS
 const show = document.querySelector('[dusk="helpdesk-ticket-show"]');
-const component = show?.closest('[wire\\:id]');
+
+let component = show;
+while (component && ! component.hasAttribute('wire:id')) {
+    component = component.parentElement;
+}
+
 if (! component) {
     throw new Error('Helpdesk ticket show Livewire component was not found.');
 }
+
 window.Livewire.find(component.getAttribute('wire:id')).set({$encodedProperty}, {$encodedValue});
 JS);
     }