Skip to content

An AI-powered search engine with a generative UI

Fix failing tests and improve CI pipeline

Yoshiki Miura96a17da8237a
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c24434fd..9a6421e5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,8 +7,9 @@ on:
branches: [main, v0.5]
jobs:
- lint-typecheck-format:
+ lint:
runs-on: ubuntu-latest
+ name: Lint
steps:
- name: Checkout repository
@@ -25,18 +26,60 @@ jobs:
- name: Run linting
run: bun lint
+ typecheck:
+ runs-on: ubuntu-latest
+ name: Type Check
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Setup Bun
+ uses: oven-sh/setup-bun@v2
+ with:
+ bun-version: 1.2.12
+
+ - name: Install dependencies
+ run: bun install
+
- name: Run type checking
run: bun typecheck
+ format:
+ runs-on: ubuntu-latest
+ name: Format Check
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Setup Bun
+ uses: oven-sh/setup-bun@v2
+ with:
+ bun-version: 1.2.12
+
+ - name: Install dependencies
+ run: bun install
+
- name: Check formatting
run: bun format:check
- - name: Build application
- run: bun run build
- env:
- DATABASE_URL: postgresql://user:pass@localhost:5432/db
+ test:
+ runs-on: ubuntu-latest
+ name: Test
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Setup Bun
+ uses: oven-sh/setup-bun@v2
+ with:
+ bun-version: 1.2.12
+
+ - name: Install dependencies
+ run: bun install
- # Run tests only if test script exists (for v0.5 branch)
- name: Run tests
run: |
if [ -f "vitest.config.ts" ]; then
@@ -44,3 +87,26 @@ jobs:
fi
env:
DATABASE_URL: postgresql://user:pass@localhost:5432/db
+ NODE_ENV: test
+
+ build:
+ runs-on: ubuntu-latest
+ name: Build
+ needs: [lint, typecheck, format, test]
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Setup Bun
+ uses: oven-sh/setup-bun@v2
+ with:
+ bun-version: 1.2.12
+
+ - name: Install dependencies
+ run: bun install
+
+ - name: Build application
+ run: bun run build
+ env:
+ DATABASE_URL: postgresql://user:pass@localhost:5432/db
diff --git a/lib/actions/__tests__/chat-db.test.ts b/lib/actions/__tests__/chat-db.test.ts
index 42db9547..e77285f4 100644
--- a/lib/actions/__tests__/chat-db.test.ts
+++ b/lib/actions/__tests__/chat-db.test.ts
@@ -1,8 +1,6 @@
import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { generateUUID } from '@/lib/utils' // Import the UUID generator
-
-// Mock target modules first
+// Mock the chat database functions
vi.mock('@/lib/db/chat', () => ({
clearChats: vi.fn(),
deleteChat: vi.fn(),
@@ -16,13 +14,17 @@ vi.mock('@/lib/db/chat', () => ({
deleteTrailingMessages: vi.fn(),
shareChatDb: vi.fn()
}))
+
+// Mock auth functions
vi.mock('@/lib/auth/get-current-user', () => ({
getCurrentUserId: vi.fn()
}))
+// Now safe to import modules that depend on database
import { getCurrentUserId } from '@/lib/auth/get-current-user'
import * as chatDb from '@/lib/db/chat'
-import type { Chat as DBChat, Message as DBMessage } from '@/lib/db/schema' // Import DB schema types for test data
+import type { Chat as DBChat, Message as DBMessage } from '@/lib/db/schema'
+import { generateUUID } from '@/lib/utils'
import {
clearChats,
@@ -33,15 +35,15 @@ import {
saveSingleMessage
} from '../chat-db'
-const mockClearChats = chatDb.clearChats as any
-const mockDeleteChatDb = chatDb.deleteChat as any
-const mockGetChatsDb = chatDb.getChats as any
-const mockGetChatDb = chatDb.getChat as any
-const mockGetSharedChatDb = chatDb.getSharedChat as any
-const mockGetChatMessagesDb = chatDb.getChatMessages as any
-const mockAddMessageDb = chatDb.addMessage as any
-const mockSaveChatDb = chatDb.saveChat as any
-const mockGetCurrentUserId = getCurrentUserId as any
+const mockClearChats = vi.mocked(chatDb.clearChats)
+const mockDeleteChatDb = vi.mocked(chatDb.deleteChat)
+const mockGetChatsDb = vi.mocked(chatDb.getChats)
+const mockGetChatDb = vi.mocked(chatDb.getChat)
+const mockGetSharedChatDb = vi.mocked(chatDb.getSharedChat)
+const mockGetChatMessagesDb = vi.mocked(chatDb.getChatMessages)
+const mockAddMessageDb = vi.mocked(chatDb.addMessage)
+const mockSaveChatDb = vi.mocked(chatDb.saveChat)
+const mockGetCurrentUserId = vi.mocked(getCurrentUserId)
const now = new Date().toISOString()
diff --git a/lib/db/index.ts b/lib/db/index.ts
index 1e0f9d9d..240b8c91 100644
--- a/lib/db/index.ts
+++ b/lib/db/index.ts
@@ -5,12 +5,12 @@ import * as relations from './relations'
import * as schema from './schema'
// For server-side usage only
-if (!process.env.DATABASE_URL) {
+if (!process.env.DATABASE_URL && process.env.NODE_ENV !== 'test') {
throw new Error('DATABASE_URL environment variable is not set')
}
// Connection with connection pooling for server environments
-const connectionString = process.env.DATABASE_URL
+const connectionString = process.env.DATABASE_URL!
const client = postgres(connectionString, {
ssl: { rejectUnauthorized: false },
prepare: false,
diff --git a/package.json b/package.json
index 01af1de1..af1d8d7d 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"format": "prettier --write .",
"format:check": "prettier --check .",
"migrate": "bun run lib/db/migrate.ts",
- "test": "vitest",
+ "test": "NODE_ENV=test vitest run",
"test:watch": "vitest --watch",
"chat": "bun run scripts/chat-cli.ts"
},