fix(integration_tests): fix tasks v1

Author: cabljac

integration_test_declarative/tests/utils.ts

@@ -38,26 +38,42 @@ export async function retry<T>(fn: () => Promise<T>, options?: RetryOptions): Pr
   throw new Error(`Max retries exceeded: result = ${result}`);
 }
 
-export async function createTask(queueName: string, testId: string): Promise<string> {
-  const GCLOUD_PROJECT = process.env.GCLOUD_PROJECT || "functions-integration-tests";
-  const REGION = "us-central1";
-  const cloudTasksClient = new CloudTasksClient();
+export async function createTask(
+  project: string,
+  queue: string,
+  location: string,
+  url: string,
+  payload: Record<string, any>
+): Promise<string> {
+  const client = new CloudTasksClient();
+  const parent = client.queuePath(project, location, queue);
+
+  const serviceAccountPath =
+    process.env.GOOGLE_APPLICATION_CREDENTIALS ||
+    "/Users/jacob/firebase-functions/integration_test_declarative/sa.json";
+  if (!serviceAccountPath) {
+    throw new Error("Environment configured incorrectly.");
+  }
+  const serviceAccount = await import(serviceAccountPath);
 
-  const parent = cloudTasksClient.queuePath(GCLOUD_PROJECT, REGION, queueName);
   const task = {
     httpRequest: {
       httpMethod: "POST" as const,
-      url: `https://${REGION}-${GCLOUD_PROJECT}.cloudfunctions.net/${queueName}`,
+      url,
       oidcToken: {
-        serviceAccountEmail: `${GCLOUD_PROJECT}@appspot.gserviceaccount.com`,
+        serviceAccountEmail: serviceAccount.client_email,
+      },
+      headers: {
+        "Content-Type": "application/json",
       },
-      body: Buffer.from(JSON.stringify({ testId })).toString("base64"),
-      headers: { "Content-Type": "application/json" },
+      body: Buffer.from(JSON.stringify(payload)).toString("base64"),
     },
   };
 
-  const request = { parent, task };
-  const [response] = await cloudTasksClient.createTask(request);
+  const [response] = await client.createTask({ parent, task });
+  if (!response) {
+    throw new Error("Unable to create task");
+  }
   return response.name || "";
 }
 
@@ -88,7 +104,7 @@ async function fetchDefaultDevice(accessToken: string): Promise<AndroidDevice> {
   if (!resp.ok) {
     throw new Error(resp.statusText);
   }
-  const data = await resp.json() as any;
+  const data = (await resp.json()) as any;
   const models = data?.androidDeviceCatalog?.models || [];
   const defaultModels = models.filter(
     (m: any) =>
@@ -161,4 +177,4 @@ async function createTestMatrix(
     throw new Error(resp.statusText);
   }
   return;
-}
+}

integration_test_declarative/tests/v1/tasks.test.ts

@@ -18,40 +18,53 @@ describe("Firebase Tasks (v1)", () => {
 
   describe("task queue onDispatch trigger", () => {
     let loggedContext: admin.firestore.DocumentData | undefined;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     let taskId: string;
 
     beforeAll(async () => {
       // Function name becomes the queue name in v1, no separators needed
       const queueName = `tasksOnDispatchTests${testId}`;
+      const projectId = process.env.GCLOUD_PROJECT || "functions-integration-tests";
+      const region = "us-central1";
+      const url = `https://${region}-${projectId}.cloudfunctions.net/${queueName}`;
 
-      taskId = await createTask(queueName, testId);
+      // Use Google Cloud Tasks SDK to get proper Cloud Tasks event context
+      taskId = await createTask(projectId, queueName, region, url, { data: { testId } });
 
-      loggedContext = await retry(() =>
-        admin
-          .firestore()
-          .collection("tasksOnDispatchTests")
-          .doc(testId)
-          .get()
-          .then((logSnapshot) => logSnapshot.data())
+      loggedContext = await retry(
+        () => {
+          console.log(`🔍 Checking Firestore for document: tasksOnDispatchTests/${testId}`);
+          return admin
+            .firestore()
+            .collection("tasksOnDispatchTests")
+            .doc(testId)
+            .get()
+            .then((logSnapshot) => {
+              const data = logSnapshot.data();
+              console.log(`📄 Firestore data:`, data);
+              return data;
+            });
+        },
+        { maxRetries: 30, checkForUndefined: true }
       );
     });
 
-    it("should have the right eventType", () => {
-      expect(loggedContext?.eventType).toEqual("google.cloud.tasks.queue.v2.task.dispatch");
+    it("should have correct event id", () => {
+      expect(loggedContext?.id).toBeDefined();
     });
 
-    it("should have eventId", () => {
-      expect(loggedContext?.eventId).toBeDefined();
+    it("should have queue name", () => {
+      expect(loggedContext?.queueName).toEqual(`tasksOnDispatchTests${testId}`);
     });
 
-    it("should have timestamp", () => {
-      expect(loggedContext?.timestamp).toBeDefined();
+    it("should have retry count", () => {
+      expect(loggedContext?.retryCount).toBeDefined();
+      expect(typeof loggedContext?.retryCount).toBe("number");
     });
 
-    it("should have resource", () => {
-      expect(loggedContext?.resource).toBeDefined();
-      expect(loggedContext?.resource?.service).toEqual("cloudtasks.googleapis.com");
-      expect(loggedContext?.resource?.name).toContain(taskId);
+    it("should have execution count", () => {
+      expect(loggedContext?.executionCount).toBeDefined();
+      expect(typeof loggedContext?.executionCount).toBe("number");
     });
   });
-});
+});