wip(tests): fix

Author: JulienChampagnol

components/FeedBack/ErrorBanner.vue

@@ -1,6 +1,6 @@
 <template>
   <v-banner
-    v-if="feedback_store.server_error"
+    v-if="server_error"
     elevation="2"
     style="background-color: grey; z-index: 9999"
     position="fixed"
@@ -44,6 +44,7 @@
 
 <script setup>
   const feedback_store = use_feedback_store()
+  const { server_error } = storeToRefs(feedback_store)
 
   function reload() {
     window.location.reload()

composables/api_fetch.js

@@ -29,41 +29,47 @@ export function api_fetch(
   if (schema.max_retry) {
     request_options.max_retry = schema.max_retry
   }
-  return useFetch(schema.$id, {
-    baseURL: geode_store.base_url,
-    ...request_options,
-    onRequestError({ error }) {
-      geode_store.stop_request()
-      feedback_store.add_error(
-        error.code,
-        schema.$id,
-        error.message,
-        error.stack,
-      )
-      if (request_error_function) {
-        request_error_function(error)
-      }
-    },
-    onResponse({ response }) {
-      if (response.ok) {
-        geode_store.stop_request()
-        if (response_function) {
-          response_function(response)
+
+  return new Promise((resolve, reject) => {
+    return useFetch(schema.$id, {
+      baseURL: geode_store.base_url,
+      ...request_options,
+      async onRequestError({ error }) {
+        await geode_store.stop_request()
+        await feedback_store.add_error(
+          error.code,
+          schema.$id,
+          error.message,
+          error.stack,
+        )
+        if (request_error_function) {
+          await request_error_function(error)
+        }
+        reject(error)
+      },
+      async onResponse({ response }) {
+        if (response.ok) {
+          await geode_store.stop_request()
+          if (response_function) {
+            await response_function(response)
+          }
+          resolve(response)
+        }
+      },
+      async onResponseError({ response }) {
+        await geode_store.stop_request()
+        await feedback_store.add_error(
+          response.status,
+          schema.$id,
+          response._data.name,
+          response._data.description,
+        )
+        if (response_error_function) {
+          await response_error_function(response)
         }
-      }
-    },
-    onResponseError({ response }) {
-      geode_store.stop_request()
-      feedback_store.add_error(
-        response.status,
-        schema.$id,
-        response._data.name,
-        response._data.description,
-      )
-      if (response_error_function) {
-        response_error_function(response)
-      }
-    },
+        reject(response)
+      },
+    })
   })
 }
 

package.json

@@ -7,9 +7,9 @@
     "geode_objects": "node scripts/generate_geode_objects.js && prettier ./assets/geode_objects.js --write"
   },
   "devDependencies": {
-    "@nuxt/test-utils": "^3.13.1",
+    "@nuxt/test-utils": "^3.14.1",
     "@pinia/testing": "^0.1.5",
-    "@vitejs/plugin-vue": "^5.0.5",
+    "@vitejs/plugin-vue": "^5.1.2",
     "@vitest/coverage-v8": "^1.6.0",
     "@vue/test-utils": "^2.4.6",
     "eslint": "^8.57.0",
@@ -44,15 +44,14 @@
     "@geode/opengeodeweb-viewer": "0.2.0",
     "@kitware/vtk.js": "30.3.1",
     "@mdi/font": "^7.4.47",
-    "@pinia/nuxt": "^0.5.1",
-    "@types/node": "^20.14.2",
-    "@vueuse/components": "^10.11.0",
-    "@vueuse/nuxt": "^10.11.0",
-    "ajv": "^8.16.0",
+    "@pinia/nuxt": "^0.5.4",
+    "@vueuse/components": "^11.0.3",
+    "@vueuse/nuxt": "^11.0.3",
+    "ajv": "^8.17.1",
     "is-electron": "^2.2.2",
-    "pinia": "^2.1.7",
-    "sass": "^1.77.5",
-    "semver": "^7.6.2",
+    "pinia": "^2.2.2",
+    "sass": "^1.77.8",
+    "semver": "^7.6.3",
     "vue-recaptcha": "^2.0.3",
     "vue3-carousel": "^0.3.3"
   },
@@ -73,4 +72,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

stores/feedback.js

@@ -4,26 +4,28 @@ export const use_feedback_store = defineStore("feedback", {
     server_error: false,
   }),
   actions: {
-    add_error(code, route, name, description) {
-      this.feedbacks.push({
+    async add_error(code, route, name, description) {
+      await this.feedbacks.push({
         type: "error",
         code,
         route,
         name,
         description,
       })
     },
-    add_success(description) {
-      this.feedbacks.push({
+    async add_success(description) {
+      await this.feedbacks.push({
         type: "success",
         description,
       })
     },
-    delete_feedback(feedback_index) {
-      this.feedbacks.splice(feedback_index, 1)
+    async delete_feedback(feedback_index) {
+      await this.feedbacks.splice(feedback_index, 1)
     },
-    delete_server_error() {
-      this.server_error = false
+    async delete_server_error() {
+      console.group("delete_server_error")
+      this.$patch({ server_error: false })
+      // this.server_error = false
     },
   },
 })

stores/geode.js

@@ -1,17 +1,34 @@
+import back_schemas from "@geode/opengeodeweb-back/schemas.json"
+
 export const use_geode_store = defineStore("geode", {
   state: () => ({
-    PROTOCOL: use_infra_store().is_cloud ? "https" : "http",
-    PORT: use_infra_store().is_cloud ? "443" : "5000",
+    default_local_port: "5000",
     request_counter: 0,
     is_running: false,
   }),
   getters: {
+    protocol() {
+      if (use_infra_store().is_cloud) {
+        return "https"
+      } else {
+        return "http"
+      }
+    },
+    port() {
+      if (use_infra_store().is_cloud) {
+        return "443"
+      } else {
+        return this.default_local_port
+      }
+    },
     base_url() {
       const infra_store = use_infra_store()
-      const api_url = infra_store.api_url
-      var geode_url = `${api_url}`
+      var geode_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
       if (infra_store.is_cloud) {
-        geode_url += `/geode`
+        if (infra_store.ID == "") {
+          throw new Error("ID must not be empty in cloud mode")
+        }
+        geode_url += `/${infra_store.ID}/geode`
       }
       return geode_url
     },
@@ -25,31 +42,40 @@ export const use_geode_store = defineStore("geode", {
     },
     async do_ping() {
       const feedback_store = use_feedback_store()
-      const infra_store = use_infra_store()
-      return new Promise((resolve, reject) => {
-        useFetch("/ping", {
-          baseURL: infra_store.api_url,
-          method: "POST",
-          onRequestError({ error }) {
-            console.log("onRequestError", error)
-            errors_store.$patch({ server_error: true })
-            reject(error)
+      await api_fetch(
+        { schema: back_schemas.opengeodeweb_back.ping, params: {} },
+        {
+          request_error_function: () => {
+            feedback_store.$patch({ server_error: true })
           },
-          onResponse({ response }) {
-            if (response.ok) {
-              console.log("PATCH onResponse", response)
-              this.is_running = true
-              resolve(response)
-            }
+          response_function: () => {
+            this.is_running = true
           },
-          onResponseError({ response }) {
-            console.log("onResponseError", response)
-            
+          response_error_function: () => {
             feedback_store.$patch({ server_error: true })
-            reject(response)
           },
-        })
-      })
+        },
+      )
+      // return new Promise((resolve, reject) => {
+      //   useFetch(schemas.opengeodeweb_back.ping, {
+      //     baseURL: this.base_url,
+      //     method: "POST",
+      //     onRequestError({ error }) {
+      //       feedback_store.$patch({ server_error: true })
+      //       reject(error)
+      //     },
+      //     onResponse({ response }) {
+      //       if (response.ok) {
+      //         this.is_running = true
+      //         resolve(response)
+      //       }
+      //     },
+      //     onResponseError({ response }) {
+      //       feedback_store.$patch({ server_error: true })
+      //       reject(response)
+      //     },
+      //   })
+      // })
     },
     start_request() {
       this.request_counter++

stores/infra.js

@@ -18,18 +18,6 @@ export const use_infra_store = defineStore("infra", {
         return "localhost"
       }
     },
-
-    api_url() {
-      const geode_store = use_geode_store()
-      var api_url = `${geode_store.PROTOCOL}://${this.domain_name}:${geode_store.PORT}`
-      if (this.is_cloud) {
-        if (this.ID == "") {
-          throw new Error("ID must not be empty in cloud mode")
-        }
-        api_url += `/${this.ID}`
-      }
-      return api_url
-    },
     is_running() {
       return use_geode_store().is_running && use_viewer_store().is_running
     },

test/components/CrsSelector.nuxt.test.js

@@ -3,6 +3,8 @@
 import { describe, expect, test } from "vitest"
 import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 
+import { setActivePinia } from "pinia"
+import { createTestingPinia } from "@pinia/testing"
 import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
 import * as directives from "vuetify/directives"
@@ -19,7 +21,12 @@ const vuetify = createVuetify({
 })
 
 describe("CrsSelector.vue", async () => {
-  test(`BRep`, async () => {
+  const pinia = createTestingPinia()
+  setActivePinia(pinia)
+  const geode_store = use_geode_store()
+  geode_store.base_url = ""
+
+  test(`Default behavior`, async () => {
     const crs_list = [
       {
         authority: "EPSG",
@@ -36,7 +43,7 @@ describe("CrsSelector.vue", async () => {
     const key_to_update = "key"
     const wrapper = await mountSuspended(CrsSelector, {
       global: {
-        plugins: [vuetify],
+        plugins: [vuetify, pinia],
       },
       props: { input_geode_object: "BRep", key_to_update },
     })

test/components/ExtensionSelector.nuxt.test.js

@@ -6,6 +6,8 @@ import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
 import { createVuetify } from "vuetify"
 import * as components from "vuetify/components"
 import * as directives from "vuetify/directives"
+import { setActivePinia } from "pinia"
+import { createTestingPinia } from "@pinia/testing"
 
 import ExtensionSelector from "@/components/ExtensionSelector.vue"
 
@@ -19,6 +21,11 @@ const vuetify = createVuetify({
 })
 
 describe("ExtensionSelector.vue", async () => {
+  const pinia = createTestingPinia()
+  setActivePinia(pinia)
+  const geode_store = use_geode_store()
+  geode_store.base_url = ""
+
   test(`Select geode_object & extension`, async () => {
     const output_geode_object = "BRep"
     const output_extension = "msh"
@@ -33,7 +40,7 @@ describe("ExtensionSelector.vue", async () => {
     })
     const wrapper = await mountSuspended(ExtensionSelector, {
       global: {
-        plugins: [vuetify],
+        plugins: [vuetify, pinia],
       },
       props: { input_geode_object: "BRep", filenames: ["test.toto"] },
     })