diff --git a/.env.staging b/.env.staging index 3452b5c..bccccd4 100644 --- a/.env.staging +++ b/.env.staging @@ -1 +1 @@ -VITE_API_URL= \ No newline at end of file +VITE_API_URL=http://localhost:5173/api \ No newline at end of file diff --git a/package.json b/package.json index 862a69f..d8cdc53 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "build": "run-p type-check \"build-only {@}\" --", "preview": "vite preview", "remove-build": "rm -rf -d ./dist ./dist-staging", - "test:unit": "TZ=Africa vitest", - "test:unit:coverage": "TZ=Africa vitest run --coverage", - "test:unit:ci": "TZ=Africa vitest run", + "test:unit": "TZ=Africa vitest --mode staging", + "test:unit:coverage": "TZ=Africa vitest run --coverage --mode staging", + "test:unit:ci": "TZ=Africa vitest run --mode staging", "test:e2e": "start-server-and-test preview http://localhost:4173 'cypress run --e2e'", "test:e2e:dev": "start-server-and-test 'vite dev --port 4173' http://localhost:4173 'cypress open --e2e'", "build-only": "vite build", diff --git a/src/utils/__tests__/apiConfig.spec.ts b/src/utils/__tests__/apiConfig.spec.ts index 77ea55c..802c321 100644 --- a/src/utils/__tests__/apiConfig.spec.ts +++ b/src/utils/__tests__/apiConfig.spec.ts @@ -4,9 +4,7 @@ import { OpenAPI } from "@/services/apis/user"; describe("apiConfig", () => { it("should set the config", () => { - const apiUrl = "http://localhost:5173/api"; - process.env.VITE_API_URL = apiUrl; setApiBaseUrl(); - expect(OpenAPI.BASE).toBe(apiUrl); + expect(OpenAPI.BASE).toBe(import.meta.env.VITE_API_URL); }); }); \ No newline at end of file diff --git a/vitest.config.ts b/vitest.config.ts index c03c88d..f1ddff7 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,6 +1,7 @@ import { fileURLToPath } from "node:url"; import { configDefaults, defineConfig, mergeConfig } from "vitest/config"; import viteConfig from "./vite.config"; +import { loadEnv } from "vite"; export default defineConfig((configEnv) => mergeConfig( @@ -43,6 +44,7 @@ export default defineConfig((configEnv) => "**/*.spec.ts", ], }, + env: loadEnv(configEnv.mode, process.cwd(), ""), // mode defines what ".env.{mode}" file to choose if exists }, }), ),