Fix Tests

Author: schmidt-sebastian

packages/firestore/exp/test/shim.ts

@@ -67,6 +67,7 @@ import { UntypedFirestoreDataConverter } from '../../src/api/user_data_reader';
 import { isPartialObserver, PartialObserver } from '../../src/api/observer';
 import { isPlainObject } from '../../src/util/input_validation';
 import { Compat } from '../../src/compat/compat';
+import { validateSetOptions } from '../../src/api/database';
 
 export { GeoPoint, Timestamp } from '../index';
 export { FieldValue } from '../../src/compat/field_value';
@@ -189,6 +190,7 @@ export class Transaction
     options?: legacy.SetOptions
   ): Transaction {
     if (options) {
+      validateSetOptions('Transaction.set', options);
       this._delegate.set(documentRef._delegate, unwrap(data), options);
     } else {
       this._delegate.set(documentRef._delegate, unwrap(data));
@@ -241,6 +243,7 @@ export class WriteBatch
     options?: legacy.SetOptions
   ): WriteBatch {
     if (options) {
+      validateSetOptions('WriteBatch.set', options);
       this._delegate.set(documentRef._delegate, unwrap(data), options);
     } else {
       this._delegate.set(documentRef._delegate, unwrap(data));
@@ -320,6 +323,7 @@ export class DocumentReference<T = legacy.DocumentData>
 
   set(data: Partial<T>, options?: legacy.SetOptions): Promise<void> {
     if (options) {
+      validateSetOptions('DocumentReference.set', options);
       return setDoc(this._delegate, unwrap(data), options);
     } else {
       return setDoc(this._delegate, unwrap(data));

packages/firestore/lite/src/api/reference.ts

@@ -409,7 +409,7 @@ class QueryLimitConstraint extends QueryConstraint {
  * @return The created `Query`.
  */
 export function limit(limit: number): QueryConstraint {
-  validatePositiveNumber('limit', 1, limit);
+  validatePositiveNumber('limit', limit);
   return new QueryLimitConstraint('limit', limit, LimitType.First);
 }
 
@@ -423,7 +423,7 @@ export function limit(limit: number): QueryConstraint {
  * @return The created `Query`.
  */
 export function limitToLast(limit: number): QueryConstraint {
-  validatePositiveNumber('limitToLast', 1, limit);
+  validatePositiveNumber('limitToLast', limit);
   return new QueryLimitConstraint('limitToLast', limit, LimitType.Last);
 }
 

packages/firestore/src/api/database.ts

@@ -1837,7 +1837,7 @@ export class Query<T = DocumentData> implements PublicQuery<T> {
   }
 
   limit(n: number): PublicQuery<T> {
-    validatePositiveNumber('Query.limit', 1, n);
+    validatePositiveNumber('Query.limit', n);
     return new Query(
       queryWithLimit(this._query, n, LimitType.First),
       this.firestore,
@@ -1846,7 +1846,7 @@ export class Query<T = DocumentData> implements PublicQuery<T> {
   }
 
   limitToLast(n: number): PublicQuery<T> {
-    validatePositiveNumber('Query.limitToLast', 1, n);
+    validatePositiveNumber('Query.limitToLast', n);
     return new Query(
       queryWithLimit(this._query, n, LimitType.Last),
       this.firestore,
@@ -2231,7 +2231,7 @@ export class CollectionReference<T = DocumentData>
   }
 }
 
-function validateSetOptions(
+export function validateSetOptions(
   methodName: string,
   options: SetOptions | undefined
 ): SetOptions {

packages/firestore/src/util/input_validation.ts

@@ -170,38 +170,11 @@ export function cast<T>(
   return obj as T;
 }
 
-export function validatePositiveNumber(
-  functionName: string,
-  position: number,
-  n: number
-): void {
+export function validatePositiveNumber(functionName: string, n: number): void {
   if (n <= 0) {
     throw new FirestoreError(
       Code.INVALID_ARGUMENT,
-      `Function ${functionName}() requires its ${ordinal(
-        position
-      )} argument to be a positive number, but it was: ${n}.`
+      `Function ${functionName}() requires a positive number, but it was: ${n}.`
     );
   }
 }
-
-/** Converts a number to its english word representation */
-function ordinal(num: number): string {
-  switch (num) {
-    case 1:
-      return 'first';
-    case 2:
-      return 'second';
-    case 3:
-      return 'third';
-    default:
-      return num + 'th';
-  }
-}
-
-/**
- * Formats the given word as plural conditionally given the preceding number.
- */
-function formatPlural(num: number, str: string): string {
-  return `${num} ${str}` + (num === 1 ? '' : 's');
-}

packages/firestore/test/integration/api/validation.test.ts

@@ -684,12 +684,12 @@ apiDescribe('Validation:', (persistence: boolean) => {
       expect(() => collection.limit(0)).to.throw(
         `Function ${
           usesFunctionalApi() ? 'limit' : 'Query.limit'
-        }() requires its first argument to be a positive number, but it was: 0.`
+        }() requires a positive number, but it was: 0.`
       );
       expect(() => collection.limitToLast(-1)).to.throw(
         `Function ${
           usesFunctionalApi() ? 'limitToLast' : 'Query.limitToLast'
-        }() requires its first argument to be a positive number, but it was: -1.`
+        }() requires a positive number, but it was: -1.`
       );
     });