(fix): improve fdr test setup (#682)

.github/workflows/ci.yml

@@ -76,8 +76,8 @@ jobs:
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           workingDir: packages/ui/app
-
-  test:
+  
+  fern-generate: 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -92,13 +92,30 @@ jobs:
           pnpm fern generate --local --api fdr
           pnpm turbo --filter=@fern-platform/fdr codegen
 
+      - name: Ensure no changes to git-tracked files
+        run: git --no-pager diff --exit-code
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2 # This helps turbo resolve changes faster
+
+      - name: Install
+        uses: ./.github/actions/install
+
       - name: Run tests
         run: pnpm test
         env:
           CI: true
 
-      - name: Ensure no changes to git-tracked files
-        run: git --no-pager diff --exit-code
+      - name: Run tests against local FDR
+        run: |
+          cd servers/fdr
+          pnpm test:local
+        env:
+          CI: true
 
   check-docs-release-is-allowed:
     runs-on: ubuntu-latest

.github/workflows/fdr-ete.yml

@@ -3,36 +3,35 @@ name: Test FDR ETE
 on:
   push:
     paths:
-      - 'fern/apis/fdr/**'
-      - 'fern/fern.config.json'
-      - 'servers/fdr-deploy/**'
-      - 'servers/fdr/**'
-      - '.github/workflows/deploy-fdr.yml'
-      - 'packages/fdr-sdk/**'
-      - 'pnpm-lock.yaml'
+      - "fern/apis/fdr/**"
+      - "fern/fern.config.json"
+      - "servers/fdr-deploy/**"
+      - "servers/fdr/**"
+      - ".github/workflows/deploy-fdr.yml"
+      - "packages/fdr-sdk/**"
+      - "pnpm-lock.yaml"
 
 env:
   PACKAGE_NAME: "@fern-platform/fdr"
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: "buildwithfern"
   FERN_TOKEN: ${{ secrets.FERN_TOKEN }}
 
-jobs: 
-  run: 
-    runs-on: ubuntu-latest    
+jobs:
+  run:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 2 # This helps turbo resolve changes faster
-      
+
       - name: Install
         uses: ./.github/actions/install
-      
+
       - name: Setup database
         # TODO: re-enable when moving to turbo
         # pnpm turbo --filter= docker:local
         run: |
           cd servers/fdr
           pnpm run docker:local
           pnpm run test:ete
-  

.vscode/settings.json

@@ -15,5 +15,6 @@
   "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "vitest.commandLine": "pnpm test"
+  "vitest.commandLine": "pnpm test",
+  "vitest.disableWorkspaceWarning": true
 }

servers/fdr/package.json

@@ -48,6 +48,7 @@
     "@fern-platform/configs": "workspace:*",
     "@types/compression": "^1.7.5",
     "@types/cors": "^2.8.13",
+    "@types/execa": "^2.0.0",
     "@types/express": "^4.17.13",
     "@types/html-to-text": "^9.0.1",
     "@types/httpsnippet": "^1.23.1",
@@ -59,6 +60,7 @@
     "dotenv-cli": "^6.0.0",
     "eslint": "^8.56.0",
     "eslint-config-custom": "*",
+    "execa": "^5.1.1",
     "nodemon": "^3.0.0",
     "prettier": "^3.2.4",
     "prisma": "5.11.0",
@@ -85,10 +87,9 @@
     "docker:dev": "dotenv -e .env.dev -- ./create_docker.sh",
     "docker:prod": "dotenv -e .env.prod -- ./create_docker.sh",
     "test": "vitest src/__test__/unit-tests --globals",
-    "test:ete": "dotenv -e .env.ete -- ./scripts/ete-tests.sh",
     "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore",
     "lint:eslint:fix": "pnpm lint:eslint --fix",
-    "test-db": "dotenv -e .env.test -- ./scripts/db-tests.sh",
-    "test-ete": "dotenv -e .env.ete -- ./scripts/ete-tests.sh"
+    "test:local": "dotenv -e .env.test -- vitest src/__test__/local --globals --config src/__test__/local/vitest.config.ts",
+    "test:ete": "dotenv -e .env.ete -- vitest src/__test__/ete --globals --config src/__test__/ete/vitest.config.ts"
   }
 }