From 7648fc674363d69d73364a38d37814a9a684f1e4 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 28 Mar 2025 08:06:51 +0100
Subject: [PATCH] refactor: refs #8534 simplify stateQueryGuard usage and
 improve test structure

---
 src/router/__tests__/hooks.spec.js | 13 +++++--------
 src/router/index.js                |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/router/__tests__/hooks.spec.js b/src/router/__tests__/hooks.spec.js
index 1bc3e2e0b27..97f5eacdc7b 100644
--- a/src/router/__tests__/hooks.spec.js
+++ b/src/router/__tests__/hooks.spec.js
@@ -1,17 +1,15 @@
 import { describe, it, expect, vi } from 'vitest';
 import { ref, nextTick } from 'vue';
 import { stateQueryGuard } from 'src/router/hooks';
-import { __test as testStateQuery } from 'src/stores/useStateQueryStore';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
 vi.mock('src/stores/useStateQueryStore', () => {
     const isLoading = ref(true);
     return {
         useStateQueryStore: () => ({
             isLoading: () => isLoading,
+            setLoading: isLoading,
         }),
-        __test: {
-            isLoading,
-        },
     };
 });
 
@@ -21,16 +19,15 @@ describe('hooks', () => {
         it('should wait until the state query is not loading and then call next()', async () => {
             const next = vi.fn();
 
-            const guardPromise = stateQueryGuard(foo, { name: 'bar' }, next);
+            stateQueryGuard(foo, { name: 'bar' }, next);
             expect(next).not.toHaveBeenCalled();
 
-            testStateQuery.isLoading.value = false;
+            useStateQueryStore().setLoading.value = false;
             await nextTick();
-            await guardPromise;
             expect(next).toHaveBeenCalled();
         });
 
-        it('should ignore if both routes are the same', async () => {
+        it('should ignore if both routes are the same', () => {
             const next = vi.fn();
             stateQueryGuard(foo, foo, next);
             expect(next).toHaveBeenCalled();
diff --git a/src/router/index.js b/src/router/index.js
index f8659308ae6..628a53c8e57 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,8 +23,8 @@ export { Router };
 export default defineRouter(() => {
     const state = useState();
     Router.beforeEach((to, from, next) => navigationGuard(to, from, next, Router, state));
-    Router.beforeEach((to, from, next) => stateQueryGuard(to, from, next));
-    Router.afterEach((to) => setPageTitle(to));
+    Router.beforeEach(stateQueryGuard);
+    Router.afterEach(setPageTitle);
 
     Router.onError(({ message }) => {
         const errorMessages = [