From 7cc8bb663aa33cfd10db9b22fd0e2906d7067191 Mon Sep 17 00:00:00 2001
From: weroperking <139503221+weroperking@users.noreply.github.com>
Date: Sun, 29 Mar 2026 23:28:22 +0200
Subject: [PATCH] Fix flaky/unhandled test errors in client and core suites

---
 packages/client/test/auth.test.ts    |  3 ++-
 packages/core/test/branching.test.ts | 15 +++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/client/test/auth.test.ts b/packages/client/test/auth.test.ts
index 1b61392..f3dd2a0 100644
--- a/packages/client/test/auth.test.ts
+++ b/packages/client/test/auth.test.ts
@@ -1,3 +1,5 @@
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, mock } from "bun:test";
+
 // Mock the better-auth/client module - must be before AuthClient import
 const mockSignUp = mock(async (params: { email: string; password: string; name: string }) => {
 	return {
@@ -79,7 +81,6 @@ mock.module("better-auth/client", () => ({
 	})),
 }));
 
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, mock } from "bun:test";
 import { AuthClient } from "../src/auth";
 import { AuthError, NetworkError } from "../src/errors";
 
diff --git a/packages/core/test/branching.test.ts b/packages/core/test/branching.test.ts
index d36bf28..fa1f0d8 100644
--- a/packages/core/test/branching.test.ts
+++ b/packages/core/test/branching.test.ts
@@ -397,26 +397,21 @@ describe("branching/database - DatabaseBranching", () => {
 
 	describe("listPreviewDatabases", () => {
 		test("returns array of preview database names", async () => {
-			// Without actual DB connection, this will fail
-			// But we can verify it returns a promise
-			const promise = dbBranching.listPreviewDatabases();
-			expect(promise).toBeInstanceOf(Promise);
+			await expect(dbBranching.listPreviewDatabases()).rejects.toThrow();
 		});
 	});
 
 	describe("previewDatabaseExists", () => {
 		test("returns promise for checking database existence", async () => {
-			const promise = dbBranching.previewDatabaseExists("preview_test");
-			expect(promise).toBeInstanceOf(Promise);
+			await expect(dbBranching.previewDatabaseExists("preview_test")).rejects.toThrow();
 		});
 	});
 
 	describe("teardownPreviewDatabase", () => {
 		test("returns promise for teardown operation", async () => {
-			const promise = dbBranching.teardownPreviewDatabase(
-				"postgres://user:password@localhost:5432/preview_test",
-			);
-			expect(promise).toBeInstanceOf(Promise);
+			await expect(
+				dbBranching.teardownPreviewDatabase("postgres://user:password@localhost:5432/preview_test"),
+			).rejects.toThrow();
 		});
 	});
 });