chore: Run tests against local build in CI (#273)

Remove Vercel preview dependency for CI tests.
anti-work · Jan 15, 2025 · 4daaa26 · 4daaa26
1 parent b8151ff
commit 4daaa26
Show file tree

Hide file tree

Showing 8 changed files with 265 additions and 25 deletions.
diff --git a/.github/workflows/shortest.yml b/.github/workflows/shortest.yml
@@ -10,21 +10,17 @@ jobs:
     timeout-minutes: 10
 
     env:
-      ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-      CLERK_PUBLISHABLE_KEY: ${{ secrets.CLERK_PUBLISHABLE_KEY }}
-      CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
-      MAILOSAUR_API_KEY: ${{ secrets.MAILOSAUR_API_KEY }}
-      MAILOSAUR_SERVER_ID: ${{ secrets.MAILOSAUR_SERVER_ID }}
+      VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
+      VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+      VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
 
     steps:
       - uses: actions/checkout@v4
 
-      # Setup pnpm first
       - uses: pnpm/action-setup@v2
         with:
           version: 8
 
-      # Then setup Node with pnpm caching
       - uses: actions/setup-node@v4
         with:
           node-version: 20
@@ -34,20 +30,29 @@ jobs:
       - name: Install dependencies
         run: pnpm install --no-frozen-lockfile
 
+      - name: Pull and set up .env.local
+        run: |
+          pnpm dlx vercel pull --environment=preview --token=$VERCEL_TOKEN
+          cp .vercel/.env.preview.local .env.local
+          test -f .env.local || (echo ".env.local not created" && exit 1)
+
+      - name: Setup database
+        run: |
+          pnpm drizzle-kit generate
+          pnpm db:migrate
+          pnpm db:seed
+
       - name: Install Playwright
         run: pnpm exec playwright install chromium
 
-      - name: Wait for Vercel preview deployment
-        uses: patrickedqvist/wait-for-vercel-preview@v1.3.2
-        id: waitFor
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          max_timeout: 300
+      - name: Build app
+        run: pnpm build
+
+      - name: Start app in background
+        run: pnpm start -p 3000 & sleep 10
 
       - name: Run Shortest tests
-        env:
-          SHORTEST_TEST_BASE_URL: ${{ steps.waitFor.outputs.url }}
-        run: pnpm shortest --headless --target=${{ steps.waitFor.outputs.url }}
+        run: pnpm shortest --headless
 
       - name: Upload artifacts
         if: failure()

diff --git a/lib/db/cleanup.ts b/lib/db/cleanup.ts
@@ -2,7 +2,7 @@ import dotenv from "dotenv";
 import { sql } from "drizzle-orm";
 import { db, client } from "@/lib/db/drizzle";
 
-dotenv.config();
+dotenv.config({ path: ".env.local" });
 
 async function cleanup() {
   try {

diff --git a/lib/db/drizzle.ts b/lib/db/drizzle.ts
@@ -3,7 +3,8 @@ import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 import * as schema from "@/lib/db/schema";
 
-dotenv.config();
+// Load .env and .env.local
+dotenv.config({ path: ".env.local" });
 
 if (!process.env.POSTGRES_URL) {
   throw new Error("POSTGRES_URL environment variable is not set");

diff --git a/lib/db/migrate.ts b/lib/db/migrate.ts
@@ -4,7 +4,7 @@ import { migrate } from "drizzle-orm/postgres-js/migrator";
 
 import { client, db } from "@/lib/db/drizzle";
 
-dotenv.config();
+dotenv.config({ path: ".env.local" });
 
 async function main() {
   await migrate(db, {

diff --git a/package.json b/package.json
@@ -13,12 +13,10 @@
     "db:cleanup": "tsx lib/db/cleanup.ts",
     "stripe:webhooks": "stripe listen --forward-to http://localhost:3000/api/stripe/webhook",
     "setup": "npx tsx lib/setup.ts",
-
     "pkg:build": "cd packages/shortest && pnpm build",
     "pkg:dev": "cd packages/shortest && pnpm dev",
     "pkg:test": "cd packages/shortest && pnpm shortest",
     "pkg:test:src": "npx tsx packages/shortest/src/cli/bin.ts",
-
     "test": "pnpm shortest",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
@@ -92,6 +90,7 @@
     "@typescript-eslint/eslint-plugin": "^8.18.2",
     "@typescript-eslint/parser": "^8.18.2",
     "@vitejs/plugin-react": "^4.3.1",
+    "dotenv": "^8.0.0",
     "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.31.0",

diff --git a/packages/shortest/src/browser/integrations/github.ts b/packages/shortest/src/browser/integrations/github.ts
@@ -17,7 +17,6 @@ export class GitHubTool {
 
   constructor(secret?: string) {
     dotenv.config({ path: ".env.local" });
-    dotenv.config({ path: ".env" });
 
     this.totpSecret = secret || process.env.GITHUB_TOTP_SECRET || "";
 

diff --git a/packages/shortest/src/index.ts b/packages/shortest/src/index.ts
@@ -41,7 +41,6 @@ if (!global.__shortest__) {
   // Attach to global scope
   global.expect = global.__shortest__.expect;
 
-  dotenv.config({ path: join(process.cwd(), ".env") });
   dotenv.config({ path: join(process.cwd(), ".env.local") });
 }
 
@@ -65,7 +64,6 @@ function validateConfig(config: Partial<ShortestConfig>) {
 export async function initialize() {
   if (globalConfig) return globalConfig;
 
-  dotenv.config({ path: join(process.cwd(), ".env") });
   dotenv.config({ path: join(process.cwd(), ".env.local") });
 
   const configFiles = [