From 47f2620ca76ec2bfa31c4c6dcd69eccc8559edc7 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 11 Dec 2025 16:10:10 +0100 Subject: [PATCH 1/7] Revert "fix(Deps): vitest 4" This reverts commit fbcb00487d490d524669d7bc652cf65fe1c3bb5d. --- package.json | 2 +- ..._when_microservices_connected.nuxt.test.js | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 7c0f2606..da32ceaa 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "unplugin-auto-import": "20.0.0", "vite": "6.3.5", "vite-plugin-vuetify": "2.1.1", - "vitest": "4.0.15", + "vitest": "3.2.4", "vitest-environment-nuxt": "1.0.1" }, "overrides": { diff --git a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js index ea8c35c9..de44a771 100644 --- a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js +++ b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js @@ -41,6 +41,16 @@ describe("run_function_when_microservices_connected", () => { await viewerStore.$patch({ status: Status.NOT_CONNECTED }) }) + test("microservices connected", async () => { + const geodeStore = useGeodeStore() + const viewerStore = useViewerStore() + const spy = vi.spyOn(dumb_obj, "dumb_method") + run_function_when_microservices_connected(dumb_obj.dumb_method) + await geodeStore.$patch({ status: Status.CONNECTED }) + await viewerStore.$patch({ status: Status.CONNECTED }) + expect(spy).toHaveBeenCalled() + }) + test("microservices not connected", async () => { const geodeStore = useGeodeStore() const viewerStore = useViewerStore() @@ -55,14 +65,4 @@ describe("run_function_when_microservices_connected", () => { console.log("microservices_connected", infraStore.microservices_connected) expect(spy).not.toHaveBeenCalled() }) - - test("microservices connected", async () => { - const geodeStore = useGeodeStore() - const viewerStore = useViewerStore() - const spy = vi.spyOn(dumb_obj, "dumb_method") - run_function_when_microservices_connected(dumb_obj.dumb_method) - await geodeStore.$patch({ status: Status.CONNECTED }) - await viewerStore.$patch({ status: Status.CONNECTED }) - expect(spy).toHaveBeenCalled() - }) }) From 15a7384096dbe6ae0558838f3d8bc5dae54dc0b0 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 11 Dec 2025 16:15:37 +0100 Subject: [PATCH 2/7] fix(Deps): vitest 4 --- package.json | 2 +- ..._when_microservices_connected.nuxt.test.js | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index da32ceaa..7c0f2606 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "unplugin-auto-import": "20.0.0", "vite": "6.3.5", "vite-plugin-vuetify": "2.1.1", - "vitest": "3.2.4", + "vitest": "4.0.15", "vitest-environment-nuxt": "1.0.1" }, "overrides": { diff --git a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js index de44a771..ea8c35c9 100644 --- a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js +++ b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js @@ -41,16 +41,6 @@ describe("run_function_when_microservices_connected", () => { await viewerStore.$patch({ status: Status.NOT_CONNECTED }) }) - test("microservices connected", async () => { - const geodeStore = useGeodeStore() - const viewerStore = useViewerStore() - const spy = vi.spyOn(dumb_obj, "dumb_method") - run_function_when_microservices_connected(dumb_obj.dumb_method) - await geodeStore.$patch({ status: Status.CONNECTED }) - await viewerStore.$patch({ status: Status.CONNECTED }) - expect(spy).toHaveBeenCalled() - }) - test("microservices not connected", async () => { const geodeStore = useGeodeStore() const viewerStore = useViewerStore() @@ -65,4 +55,14 @@ describe("run_function_when_microservices_connected", () => { console.log("microservices_connected", infraStore.microservices_connected) expect(spy).not.toHaveBeenCalled() }) + + test("microservices connected", async () => { + const geodeStore = useGeodeStore() + const viewerStore = useViewerStore() + const spy = vi.spyOn(dumb_obj, "dumb_method") + run_function_when_microservices_connected(dumb_obj.dumb_method) + await geodeStore.$patch({ status: Status.CONNECTED }) + await viewerStore.$patch({ status: Status.CONNECTED }) + expect(spy).toHaveBeenCalled() + }) }) From fe6d1604aaf3c676f5c08ebeb06bc94b22f5359c Mon Sep 17 00:00:00 2001 From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com> Date: Thu, 11 Dec 2025 15:17:57 +0000 Subject: [PATCH 3/7] Apply prepare changes --- tests/integration/microservices/back/requirements.txt | 1 - tests/integration/microservices/viewer/requirements.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/integration/microservices/back/requirements.txt b/tests/integration/microservices/back/requirements.txt index 642f9cb6..bd3a3ef5 100644 --- a/tests/integration/microservices/back/requirements.txt +++ b/tests/integration/microservices/back/requirements.txt @@ -5,4 +5,3 @@ # pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in # -opengeodeweb-back==5.*,>=5.14.1 diff --git a/tests/integration/microservices/viewer/requirements.txt b/tests/integration/microservices/viewer/requirements.txt index 147e1750..4d097394 100644 --- a/tests/integration/microservices/viewer/requirements.txt +++ b/tests/integration/microservices/viewer/requirements.txt @@ -5,4 +5,3 @@ # pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in # -opengeodeweb-viewer==1.*,>=1.13.2 From ab7fcf1ad7687814372b32efac7592600acea7aa Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 11 Dec 2025 17:17:04 +0100 Subject: [PATCH 4/7] override From 43528cae72029442ada269f5806e361f8960980d Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 11 Dec 2025 17:18:41 +0100 Subject: [PATCH 5/7] fix(Deps): vitest 4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da32ceaa..7c0f2606 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "unplugin-auto-import": "20.0.0", "vite": "6.3.5", "vite-plugin-vuetify": "2.1.1", - "vitest": "3.2.4", + "vitest": "4.0.15", "vitest-environment-nuxt": "1.0.1" }, "overrides": { From 517a2529efa2b95a7f03316224a4aec791bd5829 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 11 Dec 2025 17:21:30 +0100 Subject: [PATCH 6/7] tests order --- ..._when_microservices_connected.nuxt.test.js | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js index de44a771..c9d88fe3 100644 --- a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js +++ b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js @@ -41,16 +41,20 @@ describe("run_function_when_microservices_connected", () => { await viewerStore.$patch({ status: Status.NOT_CONNECTED }) }) - test("microservices connected", async () => { + test("microservices not connected", async () => { const geodeStore = useGeodeStore() const viewerStore = useViewerStore() + const infraStore = useInfraStore() const spy = vi.spyOn(dumb_obj, "dumb_method") run_function_when_microservices_connected(dumb_obj.dumb_method) - await geodeStore.$patch({ status: Status.CONNECTED }) - await viewerStore.$patch({ status: Status.CONNECTED }) - expect(spy).toHaveBeenCalled() - }) + await geodeStore.$patch({ status: Status.NOT_CONNECTED }) + await viewerStore.$patch({ status: Status.NOT_CONNECTED }) + console.log("geodeStore", geodeStore.status) + console.log("viewerStore", viewerStore.status) + console.log("microservices_connected", infraStore.microservices_connected) + expect(spy).not.toHaveBeenCalled() + }) test("microservices not connected", async () => { const geodeStore = useGeodeStore() const viewerStore = useViewerStore() @@ -65,4 +69,14 @@ describe("run_function_when_microservices_connected", () => { console.log("microservices_connected", infraStore.microservices_connected) expect(spy).not.toHaveBeenCalled() }) + + test("microservices connected", async () => { + const geodeStore = useGeodeStore() + const viewerStore = useViewerStore() + const spy = vi.spyOn(dumb_obj, "dumb_method") + run_function_when_microservices_connected(dumb_obj.dumb_method) + await geodeStore.$patch({ status: Status.CONNECTED }) + await viewerStore.$patch({ status: Status.CONNECTED }) + expect(spy).toHaveBeenCalled() + }) }) From 24f4ec7eaf17b12d21deae9fd38f7974602c9db8 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Fri, 12 Dec 2025 09:55:40 +0100 Subject: [PATCH 7/7] fix(Tests): retry 3 on CI