tests passing

Author: JulienChampagnol

nuxt.config.js

@@ -5,9 +5,9 @@ export default defineNuxtConfig({
       SITE_BRANCH:
         process.env.NODE_ENV === "production" ? process.env.SITE_BRANCH : "",
       PROJECT: process.env.NODE_ENV === "production" ? process.env.PROJECT : "",
-      BROWSER: process.env.BROWSER || false,
-      GEODE_PORT: process.env.GEODE_PORT || "",
-      VIEWER_PORT: process.env.VIEWER_PORT || "",
+      BROWSER: process.env.BROWSER ?? false,
+      GEODE_PORT: process.env.GEODE_PORT ?? null,
+      VIEWER_PORT: process.env.VIEWER_PORT ?? null,
     },
   },
 

stores/geode.js

@@ -18,8 +18,9 @@ export const use_geode_store = defineStore("geode", {
       if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
         return "443"
       }
-      if (useRuntimeConfig().public.GEODE_PORT) {
-        return useRuntimeConfig().public.GEODE_PORT
+      const GEODE_PORT = useRuntimeConfig().public.GEODE_PORT
+      if (GEODE_PORT != null && GEODE_PORT !== "") {
+        return GEODE_PORT
       }
       return this.default_local_port
     },

stores/infra.js

@@ -1,11 +1,12 @@
 import { useStorage } from "@vueuse/core"
 import Status from "@ogw_f/utils/status.js"
+import getCaptchaState from "@ogw_f/utils/captcha_state.js"
 
 export const use_infra_store = defineStore("infra", {
   state: () => ({
     app_mode: getAppMode(),
     ID: useStorage("ID", ""),
-    is_captcha_validated: true,
+    is_captcha_validated: getCaptchaState(),
     status: Status.NOT_CREATED,
   }),
   getters: {

stores/viewer.js

@@ -3,7 +3,6 @@ import vtkWSLinkClient from "@kitware/vtk.js/IO/Core/WSLinkClient"
 import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
 import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 import Status from "@ogw_f/utils/status.js"
-import { useRuntimeConfig } from "nuxt/app"
 
 export const use_viewer_store = defineStore("viewer", {
   state: () => ({
@@ -27,8 +26,9 @@ export const use_viewer_store = defineStore("viewer", {
       if (use_infra_store().app_mode == appMode.appMode.CLOUD) {
         return "443"
       }
-      if (useRuntimeConfig().public.VIEWER_PORT) {
-        return useRuntimeConfig().public.VIEWER_PORT
+      const VIEWER_PORT = useRuntimeConfig().public.VIEWER_PORT
+      if (VIEWER_PORT != null && VIEWER_PORT !== "") {
+        return VIEWER_PORT
       }
       return this.default_local_port
     },

test/components/Launcher.nuxt.test.js

@@ -31,7 +31,7 @@ global.ResizeObserver = require("resize-observer-polyfill")
 
 describe("Launcher.vue", async () => {
   test(`Mount`, async () => {
-    const spy_infra_store = vi.spyOn(infra_store, "create_backend")
+    const spy_create_backend = vi.spyOn(infra_store, "create_backend")
     const wrapper = await mountSuspended(Launcher, {
       global: {
         plugins: [vuetify],
@@ -40,6 +40,6 @@ describe("Launcher.vue", async () => {
     expect(wrapper.exists()).toBe(true)
     await infra_store.$patch({ is_captcha_validated: true })
     flushPromises()
-    expect(spy_infra_store).toHaveBeenCalled()
+    expect(spy_create_backend).toHaveBeenCalled()
   })
 })

test/stores/Viewer.nuxt.test.js

@@ -1,7 +1,6 @@
 import { setActivePinia } from "pinia"
 import { createTestingPinia } from "@pinia/testing"
 import { describe, test, expect, expectTypeOf, beforeEach } from "vitest"
-import { useRuntimeConfig } from "nuxt/app"
 
 describe("Viewer Store", () => {
   const pinia = createTestingPinia({
@@ -64,13 +63,6 @@ describe("Viewer Store", () => {
         viewer_store.default_local_port = "8080"
         expect(viewer_store.port).toBe("8080")
       })
-
-      test("test env VIEWER_PORT", () => {
-        process.env.VIEWER_PORT = "8080"
-        infra_store.app_mode = appMode.appMode.DESKTOP
-        console.log("VIEWER_PORT", useRuntimeConfig().public.VIEWER_PORT)
-        expect(viewer_store.port).toBe("8080")
-      })
     })
     describe("base_url", () => {
       test("test app_mode DESKTOP", () => {

utils/captcha_state.js

@@ -0,0 +1,11 @@
+function getCaptchaState() {
+  if (
+    getAppMode() === appMode.appMode.BROWSER ||
+    getAppMode() === appMode.appMode.DESKTOP
+  ) {
+    return true
+  }
+  return false
+}
+
+export default getCaptchaState