not completed yet

Author: PurnenduMIshra129th

scripts/setup/setup.ts

@@ -633,10 +633,10 @@ export async function betterAuthSetup(
 			"development",
 		);
 
-		return answers;
 	} catch (err) {
 		handlePromptError(err);
 	}
+	return answers;
 }
 export async function setup(): Promise<SetupAnswers> {
 	let answers: SetupAnswers = {};
@@ -721,12 +721,8 @@ export async function setup(): Promise<SetupAnswers> {
 
 	if (!useDefaultBetterAuth) {
 		answers = await betterAuthSetup(answers);
-	} else {
-		answers.BETTER_AUTH_SECRET = generateBetterauthSecret();
-		answers.API_CORS_ORIGIN = "http://localhost:4321";
-		answers.NODE_ENV = "development";
 	}
-
+		
 	answers = await administratorEmail(answers);
 
 	updateEnvVariable(answers);

test/scripts/setup/apiSetup.test.ts

@@ -36,6 +36,7 @@ describe("Setup -> apiSetup", () => {
 			{ useDefaultMinio: true },
 			{ useDefaultPostgres: true },
 			{ useDefaultCaddy: true },
+			{ useDefaultBetterAuth: true },
 			{ useDefaultApi: false },
 			{ API_BASE_URL: "http://localhost:5000" },
 			{ API_HOST: "127.0.0.1" },
@@ -64,12 +65,15 @@ describe("Setup -> apiSetup", () => {
 
 		const promptMock = vi.spyOn(inquirer, "prompt");
 
-		for (const response of mockResponses) {
-			promptMock.mockResolvedValueOnce(response);
-		}
+		const mockResponseMap = Object.assign({}, ...mockResponses);
 
+		// Return the correct value based on the prompt name
+		promptMock.mockImplementation(async ([{ name }]) => {
+			const value = mockResponseMap[name];
+			console.log("🔥 Mocking prompt:", name, "→", value);
+			return { [name]: value };
+		})
 		const answers = await setup();
-
 		const expectedEnv = {
 			API_BASE_URL: "http://localhost:5000",
 			API_HOST: "127.0.0.1",
@@ -277,7 +281,7 @@ describe("generateJwtSecret", () => {
 			});
 		const consoleErrorSpy = vi
 			.spyOn(console, "error")
-			.mockImplementation(() => {});
+			.mockImplementation(() => { });
 
 		expect(() => generateJwtSecret()).toThrow("Failed to generate JWT secret");
 		expect(consoleErrorSpy).toHaveBeenCalledWith(

test/scripts/setup/cloudbeaverSetup.test.ts

@@ -34,6 +34,7 @@ describe("Setup -> cloudbeaverSetup", () => {
 			{ useDefaultPostgres: true },
 			{ useDefaultCaddy: true },
 			{ useDefaultApi: true },
+			{ useDefaultBetterAuth: true },
 			{ API_ADMINISTRATOR_USER_EMAIL_ADDRESS: "[email protected]" },
 		];
 

test/scripts/setup/minioSetup.test.ts

@@ -56,6 +56,7 @@ describe("Setup -> minioSetup", () => {
 			{ useDefaultPostgres: true },
 			{ useDefaultCaddy: "true" },
 			{ useDefaultApi: true },
+			{ useDefaultBetterAuth: true },
 			{ API_ADMINISTRATOR_USER_EMAIL_ADDRESS: "[email protected]" },
 		];
 

test/scripts/setup/postgresSetup.test.ts

@@ -53,6 +53,7 @@ describe("Setup -> postgresSetup", () => {
 			{ POSTGRES_USER: "myUser" },
 			{ useDefaultCaddy: "true" },
 			{ useDefaultApi: "true" },
+			{ useDefaultBetterAuth: true },
 			{ API_ADMINISTRATOR_USER_EMAIL_ADDRESS: "[email protected]" },
 		];
 

test/scripts/setup/setup.test.ts

@@ -23,6 +23,7 @@ describe("Setup", () => {
 			{ useDefaultPostgres: "true" },
 			{ useDefaultCaddy: "true" },
 			{ useDefaultApi: "true" },
+			{ useDefaultBetterAuth: "true" },
 			{ API_ADMINISTRATOR_USER_EMAIL_ADDRESS: "[email protected]" },
 		];
 
@@ -69,7 +70,7 @@ describe("Setup", () => {
 
 		dotenv.config({ path: ".env" });
 
-		for (const [key, value] of Object.entries(expectedEnv)) {
+		for (const [key, value] of Object.entries(expectedEnv)) {	
 			expect(process.env[key]).toBe(value);
 		}
 	});
@@ -82,6 +83,7 @@ describe("Setup", () => {
 			{ useDefaultPostgres: "true" },
 			{ useDefaultCaddy: "true" },
 			{ useDefaultApi: "true" },
+			{ useDefaultBetterAuth: "true" },
 			{ API_ADMINISTRATOR_USER_EMAIL_ADDRESS: "[email protected]" },
 		];
 

test/scripts/setup/updateEnvVariable.test.ts

@@ -5,7 +5,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 vi.mock("fs");
 
 describe("updateEnvVariable", () => {
-	const envFileName = ".env";
+	const envFileName = ".env_test";
 	const backupFile = `${envFileName}.backup`;
 
 	beforeEach(() => {