Fix tests.

Author: rasmi

functions/package.json

@@ -10,7 +10,7 @@
     "deploy": "firebase deploy --only functions",
     "logs": "firebase functions:log",
     "test": "npm run test:unit && npm run test:firestore",
-    "test:firestore": "firebase -c firebase-test.json emulators:exec --only firestore,functions --project=demo-deliberate-lab \"npx jest $npm_package_config_firestore_tests\"",
+    "test:firestore": "firebase -c firebase-test.json emulators:exec --only firestore,functions --project=demo-deliberate-lab \"npx jest --runInBand $npm_package_config_firestore_tests\"",
     "test:unit": "npx jest --testPathIgnorePatterns=$npm_package_config_firestore_tests",
     "typecheck": "tsc --noEmit"
   },

functions/src/dl_api/dl_api_key.utils.ts

@@ -3,13 +3,13 @@
  * Handles generation, hashing, storage, and verification of API keys
  */
 
-import * as admin from 'firebase-admin';
 import {randomBytes, scrypt, createHash, timingSafeEqual} from 'crypto';
 import {promisify} from 'util';
 import {
   DeliberateLabAPIKeyPermission,
   DeliberateLabAPIKeyData,
 } from '@deliberation-lab/utils';
+import {app} from '../app';
 
 const scryptAsync = promisify(scrypt);
 
@@ -67,7 +67,6 @@ export async function createDeliberateLabAPIKey(
     DeliberateLabAPIKeyPermission.WRITE,
   ],
 ): Promise<{apiKey: string; keyId: string}> {
-  const app = admin.app();
   const firestore = app.firestore();
 
   // Generate the API key
@@ -104,7 +103,6 @@ export async function createDeliberateLabAPIKey(
 export async function verifyDeliberateLabAPIKey(
   apiKey: string,
 ): Promise<{valid: boolean; data?: DeliberateLabAPIKeyData}> {
-  const app = admin.app();
   const firestore = app.firestore();
 
   // Get key ID to look up the document
@@ -151,7 +149,6 @@ export async function revokeDeliberateLabAPIKey(
   keyId: string,
   experimenterId: string,
 ): Promise<boolean> {
-  const app = admin.app();
   const firestore = app.firestore();
 
   const doc = await firestore
@@ -195,7 +192,6 @@ export async function listDeliberateLabAPIKeys(experimenterId: string): Promise<
     permissions: DeliberateLabAPIKeyPermission[];
   }>
 > {
-  const app = admin.app();
   const firestore = app.firestore();
 
   const snapshot = await firestore

functions/src/dl_api/experiments.dl_api.integration.test.ts

@@ -4,22 +4,14 @@
  * These tests verify that experiments created via the REST API are equivalent
  * to experiments created using the traditional template system.
  *
- * This test assumes that a Firestore emulator is running.
- * Run using: npm run test:firestore experiments.api.integration.test.ts
- * Or: firebase emulators:exec --only firestore "npx jest experiments.api.integration.test.ts"
+ * This test requires a Firestore emulator running. Run via:
+ * npm run test:firestore
  */
 
-// Don't override GCLOUD_PROJECT - let firebase emulators:exec set it
-// If not set, use a demo project ID that the emulator will accept
-if (!process.env.GCLOUD_PROJECT) {
-  process.env.GCLOUD_PROJECT = 'demo-deliberate-lab';
-}
-
 import {
   initializeTestEnvironment,
   RulesTestEnvironment,
 } from '@firebase/rules-unit-testing';
-import * as admin from 'firebase-admin';
 import {
   createExperimentConfig,
   StageConfig,
@@ -53,8 +45,7 @@ describe('API Experiment Creation Integration Tests', () => {
   const createdExperimentIds: string[] = [];
 
   beforeAll(async () => {
-    // Use the same project ID that the emulator will use
-    const projectId = process.env.GCLOUD_PROJECT || 'demo-deliberate-lab';
+    const projectId = 'demo-deliberate-lab';
 
     testEnv = await initializeTestEnvironment({
       projectId,
@@ -68,13 +59,6 @@ describe('API Experiment Creation Integration Tests', () => {
     firestore = testEnv.unauthenticatedContext().firestore();
     firestore.settings({ignoreUndefinedProperties: true, merge: true});
 
-    // Initialize Firebase Admin SDK (will use emulator via FIRESTORE_EMULATOR_HOST environment variable)
-    if (!admin.apps.length) {
-      admin.initializeApp({
-        projectId,
-      });
-    }
-
     // Create test API key (this will be stored in the emulator)
     console.log('Creating API key...');
     const {apiKey} = await createDeliberateLabAPIKey(
@@ -99,7 +83,7 @@ describe('API Experiment Creation Integration Tests', () => {
       process.env.FIREBASE_FUNCTIONS_EMULATOR_PORT || '5001';
     const region = 'us-central1'; // Default region for Cloud Functions
 
-    baseUrl = `http://${functionsHost}:${functionsPort}/${projectId}/${region}/api`;
+    baseUrl = `http://${functionsHost}:${functionsPort}/{$projectId}/${region}/api`;
     console.log('API base URL:', baseUrl);
   });
 

functions/src/variables.utils.test.ts

@@ -1,14 +1,7 @@
 // This test requires a Firestore emulator running. Run via:
 // npm run test:firestore
-// Or manually:
-// FIRESTORE_EMULATOR_HOST="localhost:8080" npx jest src/variables.utils.test.ts
 
-// Set project ID before importing firebase-admin
-if (!process.env.GCLOUD_PROJECT) {
-  process.env.GCLOUD_PROJECT = 'demo-deliberate-lab';
-}
-
-import * as admin from 'firebase-admin';
+import {app} from './app';
 import {
   initializeTestEnvironment,
   RulesTestEnvironment,
@@ -27,23 +20,15 @@ import {
 } from '@deliberation-lab/utils';
 import {generateVariablesForScope} from './variables.utils';
 
-let mockFirestore: FirebaseFirestore.Firestore;
-
-jest.mock('./app', () => ({
-  app: {
-    firestore: () => mockFirestore,
-  },
-}));
+const firestore = app.firestore();
 
 describe('generateVariablesForScope', () => {
   let testEnv: RulesTestEnvironment;
 
   beforeAll(async () => {
-    const projectId = process.env.GCLOUD_PROJECT || 'demo-deliberate-lab';
-
     // Initialize test environment for cleanup utilities
     testEnv = await initializeTestEnvironment({
-      projectId,
+      projectId: 'demo-deliberate-lab',
       firestore: process.env.FIRESTORE_EMULATOR_HOST
         ? undefined
         : {
@@ -52,24 +37,14 @@ describe('generateVariablesForScope', () => {
           },
     });
 
-    // Initialize Firebase Admin SDK - this connects to the emulator
-    // via FIRESTORE_EMULATOR_HOST environment variable and has full
-    // Firestore API support including .count()
-    if (!admin.apps.length) {
-      admin.initializeApp({projectId});
-    }
-    mockFirestore = admin.firestore();
-    mockFirestore.settings({ignoreUndefinedProperties: true});
+    // Clear any leftover data from previous test runs
+    await testEnv.clearFirestore();
   });
 
   afterAll(async () => {
     await testEnv.cleanup();
   });
 
-  beforeEach(async () => {
-    await testEnv.clearFirestore();
-  });
-
   describe('static variables', () => {
     it('should generate static variables for matching scope', async () => {
       const config = createStaticVariableConfig({
@@ -167,7 +142,7 @@ describe('generateVariablesForScope', () => {
       expect(result1['condition']).toBe(JSON.stringify('control'));
 
       // Add a participant to Firestore
-      await mockFirestore
+      await firestore
         .collection(`experiments/${experimentId}/participants`)
         .doc('p1')
         .set(
@@ -189,7 +164,7 @@ describe('generateVariablesForScope', () => {
       expect(result2['condition']).toBe(JSON.stringify('treatment'));
 
       // Add second participant
-      await mockFirestore
+      await firestore
         .collection(`experiments/${experimentId}/participants`)
         .doc('p2')
         .set(
@@ -225,7 +200,7 @@ describe('generateVariablesForScope', () => {
 
       // Add participants with existing assignments
       // 2 in group A, 1 in group B, 0 in group C
-      await mockFirestore
+      await firestore
         .collection(`experiments/${experimentId}/participants`)
         .doc('existing1')
         .set({
@@ -238,7 +213,7 @@ describe('generateVariablesForScope', () => {
           variableMap: {group: JSON.stringify('A')},
         });
 
-      await mockFirestore
+      await firestore
         .collection(`experiments/${experimentId}/participants`)
         .doc('existing2')
         .set({
@@ -251,7 +226,7 @@ describe('generateVariablesForScope', () => {
           variableMap: {group: JSON.stringify('A')},
         });
 
-      await mockFirestore
+      await firestore
         .collection(`experiments/${experimentId}/participants`)
         .doc('existing3')
         .set({
@@ -328,7 +303,7 @@ describe('generateVariablesForScope', () => {
       const cohortB = 'cohort-B';
 
       // Add 1 participant to cohort A
-      await mockFirestore
+      await firestore
         .collection(`experiments/${experimentId}/participants`)
         .doc('pA1')
         .set(
@@ -410,7 +385,7 @@ describe('generateVariablesForScope', () => {
       expect(result0['weighted_condition']).toBe(JSON.stringify('A'));
 
       // Add participant 0
-      await mockFirestore
+      await firestore
         .collection(`experiments/${expId}/participants`)
         .doc('wp0')
         .set(
@@ -432,7 +407,7 @@ describe('generateVariablesForScope', () => {
       expect(result1['weighted_condition']).toBe(JSON.stringify('A'));
 
       // Add participant 1
-      await mockFirestore
+      await firestore
         .collection(`experiments/${expId}/participants`)
         .doc('wp1')
         .set(
@@ -472,7 +447,7 @@ describe('generateVariablesForScope', () => {
 
       // Add 1 participant to each group (50/50 split)
       // Target is 67/33, so A is under-represented
-      await mockFirestore
+      await firestore
         .collection(`experiments/${expId}/participants`)
         .doc('existing1')
         .set({
@@ -485,7 +460,7 @@ describe('generateVariablesForScope', () => {
           variableMap: {weighted_group: JSON.stringify('A')},
         });
 
-      await mockFirestore
+      await firestore
         .collection(`experiments/${expId}/participants`)
         .doc('existing2')
         .set({