wip: Integration tests fixes

firebase · Oct 7, 2024 · cbf0840 · cbf0840
1 parent 6c22d40
commit cbf0840
Show file tree

Hide file tree

Showing 35 changed files with 2,406 additions and 2,926 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -0,0 +1,16 @@
+steps:
+  - name: "node:18"
+    entrypoint: "npm"
+    dir: "integration_test"
+    args: ["install"]
+  - name: "node:18"
+    entrypoint: "npx"
+    dir: "integration_test"
+    args: ["firebase", "use", "cf3-integration-tests-d7be6"]
+  - name: "node:18"
+    entrypoint: "npm"
+    dir: "integration_test"
+    args: ["start"]
+
+options:
+  defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET
diff --git a/integration_test/.gitignore b/integration_test/.gitignore
@@ -70,3 +70,6 @@ node_modules/
 serviceAccount.json
 functions.yaml
 functions/src/package.json
+functions/package/
+
+.nvmrc
diff --git a/integration_test/functions/src/region.ts b/integration_test/functions/src/region.ts
@@ -1,2 +1 @@
-// TODO: Add back support for selecting region for integration test once params is ready.
-export const REGION = "us-central1";
+export const REGION = process.env.REGION;
diff --git a/integration_test/functions/src/v1/storage-tests.ts b/integration_test/functions/src/v1/storage-tests.ts
@@ -3,47 +3,47 @@ import * as functions from "firebase-functions";
 import { REGION } from "../region";
 import { sanitizeData } from "../utils";
 
-export const storageOnDeleteTests: any = functions
-  .runWith({
-    timeoutSeconds: 540,
-  })
-  .region(REGION)
-  .storage.bucket()
-  .object()
-  .onDelete(async (object, context) => {
-    const testId = object.name?.split(".")[0];
-    if (!testId) {
-      functions.logger.error("TestId not found for storage object delete");
-      return;
-    }
-
-    await admin
-      .firestore()
-      .collection("storageOnDeleteTests")
-      .doc(testId)
-      .set(sanitizeData(context));
-  });
+// export const storageOnDeleteTests: any = functions
+//   .runWith({
+//     timeoutSeconds: 540,
+//   })
+//   .region(REGION)
+//   .storage.bucket()
+//   .object()
+//   .onDelete(async (object, context) => {
+//     const testId = object.name?.split(".")[0];
+//     if (!testId) {
+//       functions.logger.error("TestId not found for storage object delete");
+//       return;
+//     }
+//
+//     await admin
+//       .firestore()
+//       .collection("storageOnDeleteTests")
+//       .doc(testId)
+//       .set(sanitizeData(context));
+//   });
 
-export const storageOnFinalizeTests: any = functions
-  .runWith({
-    timeoutSeconds: 540,
-  })
-  .region(REGION)
-  .storage.bucket()
-  .object()
-  .onFinalize(async (object, context) => {
-    const testId = object.name?.split(".")[0];
-    if (!testId) {
-      functions.logger.error("TestId not found for storage object finalize");
-      return;
-    }
-
-    await admin
-      .firestore()
-      .collection("storageOnFinalizeTests")
-      .doc(testId)
-      .set(sanitizeData(context));
-  });
+// export const storageOnFinalizeTests: any = functions
+//   .runWith({
+//     timeoutSeconds: 540,
+//   })
+//   .region(REGION)
+//   .storage.bucket()
+//   .object()
+//   .onFinalize(async (object, context) => {
+//     const testId = object.name?.split(".")[0];
+//     if (!testId) {
+//       functions.logger.error("TestId not found for storage object finalize");
+//       return;
+//     }
+//
+//     await admin
+//       .firestore()
+//       .collection("storageOnFinalizeTests")
+//       .doc(testId)
+//       .set(sanitizeData(context));
+//   });
 
 export const storageOnMetadataUpdateTests: any = functions
   .runWith({

diff --git a/integration_test/functions/src/v2/firestore-tests.ts b/integration_test/functions/src/v2/firestore-tests.ts
@@ -6,13 +6,13 @@ import {
   onDocumentUpdated,
   onDocumentWritten,
 } from "firebase-functions/v2/firestore";
-import { REGION } from "../region";
 import { sanitizeData } from "../utils";
+import { FIRESTORE_REGION } from "../region";
 
 export const firestoreOnDocumentCreatedTests = onDocumentCreated(
   {
     document: "tests/{documentId}",
-    region: REGION,
+    region: FIRESTORE_REGION,
     timeoutSeconds: 540,
   },
   async (event) => {
@@ -37,7 +37,7 @@ export const firestoreOnDocumentCreatedTests = onDocumentCreated(
 export const firestoreOnDocumentDeletedTests = onDocumentDeleted(
   {
     document: "tests/{documentId}",
-    region: REGION,
+    region: FIRESTORE_REGION,
     timeoutSeconds: 540,
   },
   async (event) => {
@@ -62,7 +62,7 @@ export const firestoreOnDocumentDeletedTests = onDocumentDeleted(
 export const firestoreOnDocumentUpdatedTests = onDocumentUpdated(
   {
     document: "tests/{documentId}",
-    region: REGION,
+    region: FIRESTORE_REGION,
     timeoutSeconds: 540,
   },
   async (event) => {
@@ -87,7 +87,7 @@ export const firestoreOnDocumentUpdatedTests = onDocumentUpdated(
 export const firestoreOnDocumentWrittenTests = onDocumentWritten(
   {
     document: "tests/{documentId}",
-    region: REGION,
+    region: FIRESTORE_REGION,
     timeoutSeconds: 540,
   },
   async (event) => {

diff --git a/integration_test/integration_test.iml b/integration_test/integration_test.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>