tests: update tests

Author: Izaak Gough

spec/v2/options.spec.ts

@@ -115,30 +115,30 @@ describe("assertTimeoutSecondsValid", () => {
     expect(() => assertTimeoutSecondsValid({ timeoutSeconds: 540 }, "event")).to.not.throw();
     expect(() => assertTimeoutSecondsValid({ timeoutSeconds: 3600 }, "https")).to.not.throw();
     expect(() => assertTimeoutSecondsValid({ timeoutSeconds: 1800 }, "task")).to.not.throw();
-    expect(() => assertTimeoutSecondsValid({ timeoutSeconds: 0 }, "event")).to.not.throw();
+    expect(() => assertTimeoutSecondsValid({ timeoutSeconds: 1 }, "event")).to.not.throw();
   });
 
   it("throws when timeoutSeconds exceeds the event-handler limit", () => {
     expect(() => assertTimeoutSecondsValid({ timeoutSeconds: 3600 }, "event")).to.throw(
-      /between 0 and 540 for event-handling functions/
+      /between 1 and 540 for event-handling functions/
     );
   });
 
   it("throws when timeoutSeconds exceeds the HTTPS limit", () => {
     expect(() => assertTimeoutSecondsValid({ timeoutSeconds: 3601 }, "https")).to.throw(
-      /between 0 and 3600 for HTTPS and callable functions/
+      /between 1 and 3600 for HTTPS and callable functions/
     );
   });
 
   it("throws when timeoutSeconds exceeds the task-queue limit", () => {
     expect(() => assertTimeoutSecondsValid({ timeoutSeconds: 1801 }, "task")).to.throw(
-      /between 0 and 1800 for task queue functions/
+      /between 1 and 1800 for task queue functions/
     );
   });
 
   it("throws when timeoutSeconds is negative", () => {
     expect(() => assertTimeoutSecondsValid({ timeoutSeconds: -1 }, "event")).to.throw(
-      /between 0 and 540/
+      /between 1 and 540/
     );
   });
 
@@ -152,18 +152,32 @@ describe("assertTimeoutSecondsValid", () => {
     expect(() => assertTimeoutSecondsValid(opts, "event")).to.not.throw();
   });
 
+  it("throws when timeoutSeconds has an invalid non-number type", () => {
+    const opts = { timeoutSeconds: "30" as unknown as number };
+    expect(() => assertTimeoutSecondsValid(opts, "event")).to.throw(
+      /must be a number, Expression, or RESET_VALUE/
+    );
+  });
+
+  it("throws when global timeoutSeconds has an invalid non-number type", () => {
+    setGlobalOptions({ timeoutSeconds: true as unknown as number });
+    expect(() => assertTimeoutSecondsValid({}, "event")).to.throw(
+      /must be a number, Expression, or RESET_VALUE/
+    );
+  });
+
   it("falls back to the global timeoutSeconds when the function-level option is absent", () => {
     setGlobalOptions({ timeoutSeconds: 3600 });
     expect(() => assertTimeoutSecondsValid({}, "event")).to.throw(
-      /between 0 and 540 for event-handling functions/
+      /between 1 and 540 for event-handling functions/
     );
     expect(() => assertTimeoutSecondsValid({}, "https")).to.not.throw();
   });
 
   it("prefers the function-level timeoutSeconds over the global one", () => {
     setGlobalOptions({ timeoutSeconds: 60 });
     expect(() => assertTimeoutSecondsValid({ timeoutSeconds: 1000 }, "event")).to.throw(
-      /between 0 and 540/
+      /between 1 and 540/
     );
   });
 
@@ -186,13 +200,13 @@ describe("optionsToEndpoint timeout validation", () => {
 
   it("throws when kind is provided and timeoutSeconds exceeds the limit", () => {
     expect(() => optionsToEndpoint({ timeoutSeconds: 3600 }, "event")).to.throw(
-      /between 0 and 540/
+      /between 1 and 540/
     );
     expect(() => optionsToEndpoint({ timeoutSeconds: 3601 }, "https")).to.throw(
-      /between 0 and 3600/
+      /between 1 and 3600/
     );
     expect(() => optionsToEndpoint({ timeoutSeconds: 1801 }, "task")).to.throw(
-      /between 0 and 1800/
+      /between 1 and 1800/
     );
   });
 
@@ -214,13 +228,13 @@ describe("optionsToTriggerAnnotations timeout validation", () => {
 
   it("throws when kind is provided and timeoutSeconds exceeds the limit", () => {
     expect(() => optionsToTriggerAnnotations({ timeoutSeconds: 3600 }, "event")).to.throw(
-      /between 0 and 540/
+      /between 1 and 540/
     );
     expect(() => optionsToTriggerAnnotations({ timeoutSeconds: 3601 }, "https")).to.throw(
-      /between 0 and 3600/
+      /between 1 and 3600/
     );
     expect(() => optionsToTriggerAnnotations({ timeoutSeconds: 1801 }, "task")).to.throw(
-      /between 0 and 1800/
+      /between 1 and 1800/
     );
   });
 

spec/v2/providers/https.spec.ts

@@ -342,7 +342,7 @@ describe("onRequest", () => {
       https.onRequest({ timeoutSeconds: 3601 }, (_req, res) => {
         res.end();
       })
-    ).to.throw(/between 0 and 3600 for HTTPS and callable functions/);
+    ).to.throw(/between 1 and 3600 for HTTPS and callable functions/);
   });
 });
 
@@ -615,7 +615,7 @@ describe("onCall", () => {
 
   it("rejects timeoutSeconds above the 3600s HTTPS limit", () => {
     expect(() => https.onCall({ timeoutSeconds: 3601 }, () => 42)).to.throw(
-      /between 0 and 3600 for HTTPS and callable functions/
+      /between 1 and 3600 for HTTPS and callable functions/
     );
   });
 

spec/v2/providers/pubsub.spec.ts

@@ -137,13 +137,13 @@ describe("onMessagePublished", () => {
   it("rejects timeoutSeconds above the 540s event-handler limit", () => {
     expect(() =>
       pubsub.onMessagePublished({ topic: "topic", timeoutSeconds: 3600 }, () => 42)
-    ).to.throw(/between 0 and 540 for event-handling functions/);
+    ).to.throw(/between 1 and 540 for event-handling functions/);
   });
 
   it("rejects a global timeoutSeconds above the 540s event-handler limit", () => {
     options.setGlobalOptions({ timeoutSeconds: 3600 });
     expect(() => pubsub.onMessagePublished("topic", () => 42)).to.throw(
-      /between 0 and 540 for event-handling functions/
+      /between 1 and 540 for event-handling functions/
     );
   });
 

spec/v2/providers/storage.spec.ts

@@ -509,7 +509,7 @@ describe("v2/storage", () => {
         { bucket: "my-bucket", timeoutSeconds: 3600 },
         () => 42
       );
-      expect(() => func.__endpoint).to.throw(/between 0 and 540 for event-handling functions/);
+      expect(() => func.__endpoint).to.throw(/between 1 and 540 for event-handling functions/);
     });
   });
 

spec/v2/providers/tasks.spec.ts

@@ -326,7 +326,7 @@ describe("onTaskDispatched", () => {
 
   it("rejects timeoutSeconds above the 1800s task-queue limit", () => {
     expect(() => onTaskDispatched({ timeoutSeconds: 1801 }, () => null)).to.throw(
-      /between 0 and 1800 for task queue functions/
+      /between 1 and 1800 for task queue functions/
     );
   });
 

spec/v2/providers/timeout.spec.ts

@@ -47,38 +47,38 @@ describe("v2 provider timeout validation", () => {
         https.onRequest({ timeoutSeconds: 3601 }, (_req, res) => {
           res.end();
         }),
-      expectedError: /between 0 and 3600 for HTTPS and callable functions/,
+      expectedError: /between 1 and 3600 for HTTPS and callable functions/,
     },
     {
       name: "https.onCall rejects HTTPS timeouts above 3600s",
       build: () => https.onCall({ timeoutSeconds: 3601 }, () => 42),
-      expectedError: /between 0 and 3600 for HTTPS and callable functions/,
+      expectedError: /between 1 and 3600 for HTTPS and callable functions/,
     },
     {
       name: "ai.beforeGenerateContent rejects HTTPS timeouts above 3600s",
       build: () => ai.beforeGenerateContent({ timeoutSeconds: 3601 }, () => ({})),
-      expectedError: /between 0 and 3600 for HTTPS and callable functions/,
+      expectedError: /between 1 and 3600 for HTTPS and callable functions/,
     },
     {
       name: "identity.beforeUserCreated rejects HTTPS timeouts above 3600s",
       build: () => identity.beforeUserCreated({ timeoutSeconds: 3601 }, () => undefined),
-      expectedError: /between 0 and 3600 for HTTPS and callable functions/,
+      expectedError: /between 1 and 3600 for HTTPS and callable functions/,
     },
     {
       name: "tasks.onTaskDispatched rejects task timeouts above 1800s",
       build: () => tasks.onTaskDispatched({ timeoutSeconds: 1801 }, () => null),
-      expectedError: /between 0 and 1800 for task queue functions/,
+      expectedError: /between 1 and 1800 for task queue functions/,
     },
     {
       name: "pubsub.onMessagePublished rejects event timeouts above 540s",
       build: () => pubsub.onMessagePublished({ topic: "topic", timeoutSeconds: 3600 }, () => 42),
-      expectedError: /between 0 and 540 for event-handling functions/,
+      expectedError: /between 1 and 540 for event-handling functions/,
     },
     {
       name: "storage.onObjectFinalized rejects event timeouts above 540s",
       build: () =>
         storage.onObjectFinalized({ bucket: "bucket", timeoutSeconds: 3600 }, () => null),
-      expectedError: /between 0 and 540 for event-handling functions/,
+      expectedError: /between 1 and 540 for event-handling functions/,
       validateOnEndpointAccess: true,
     },
     {
@@ -89,13 +89,13 @@ describe("v2 provider timeout validation", () => {
           () => null
         );
       },
-      expectedError: /between 0 and 540 for event-handling functions/,
+      expectedError: /between 1 and 540 for event-handling functions/,
     },
     {
       name: "firestore.onDocumentCreated rejects event timeouts above 540s",
       build: () =>
         firestore.onDocumentCreated({ document: "foo/{bar}", timeoutSeconds: 3600 }, () => null),
-      expectedError: /between 0 and 540 for event-handling functions/,
+      expectedError: /between 1 and 540 for event-handling functions/,
     },
     {
       name: "eventarc.onCustomEventPublished rejects event timeouts above 540s",
@@ -104,23 +104,23 @@ describe("v2 provider timeout validation", () => {
           { eventType: "event-type", timeoutSeconds: 3600 },
           () => 42
         ),
-      expectedError: /between 0 and 540 for event-handling functions/,
+      expectedError: /between 1 and 540 for event-handling functions/,
     },
     {
       name: "remoteConfig.onConfigUpdated rejects event timeouts above 540s",
       build: () => remoteConfig.onConfigUpdated({ timeoutSeconds: 3600 }, () => 42),
-      expectedError: /between 0 and 540 for event-handling functions/,
+      expectedError: /between 1 and 540 for event-handling functions/,
     },
     {
       name: "scheduler.onSchedule rejects event timeouts above 540s",
       build: () =>
         scheduler.onSchedule({ schedule: "* * * * *", timeoutSeconds: 3600 }, () => null),
-      expectedError: /between 0 and 540 for event-handling functions/,
+      expectedError: /between 1 and 540 for event-handling functions/,
     },
     {
       name: "testLab.onTestMatrixCompleted rejects event timeouts above 540s",
       build: () => testLab.onTestMatrixCompleted({ timeoutSeconds: 3600 }, () => 42),
-      expectedError: /between 0 and 540 for event-handling functions/,
+      expectedError: /between 1 and 540 for event-handling functions/,
     },
     {
       name: "dataconnect.onMutationExecuted rejects event timeouts above 540s",
@@ -134,7 +134,7 @@ describe("v2 provider timeout validation", () => {
           },
           () => true
         ),
-      expectedError: /between 0 and 540 for event-handling functions/,
+      expectedError: /between 1 and 540 for event-handling functions/,
     },
   ];