Pipeline and test cleanup

Author: MarkDuckworth

packages/firestore/src/core/pipeline-util.ts

@@ -255,8 +255,8 @@ function whereConditionsFromCursor(
   const cursors = bound.position.map(value => Constant._fromProto(value));
   const size = cursors.length;
 
-  let field = orderings[size-1].expr;
-  let value = cursors[size-1];
+  let field = orderings[size - 1].expr;
+  let value = cursors[size - 1];
 
   // Add condition for last bound
   let condition: BooleanExpr = filterFunc(field, value);
@@ -275,9 +275,7 @@ function whereConditionsFromCursor(
     // For each field in the orderings, the condition is either
     // a) lt|gt the cursor value,
     // b) or equal the cursor value and lt|gt the cursor values for other fields
-    condition = or(
-      filterFunc(field, value),
-      and(field.eq(value), condition));
+    condition = or(filterFunc(field, value), and(field.eq(value), condition));
   }
 
   return condition;

packages/firestore/src/lite-api/expressions.ts

@@ -2247,7 +2247,7 @@ export function field(nameOrPath: string | FieldPath): Field {
     if (DOCUMENT_KEY_NAME === nameOrPath) {
       return new Field(documentIdFieldPath()._internalPath);
     }
-    return new Field(fieldPathFromArgument('of', nameOrPath));
+    return new Field(fieldPathFromArgument('field', nameOrPath));
   } else {
     return new Field(nameOrPath._internalPath);
   }

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

@@ -53,7 +53,8 @@ import {
   collection,
   documentId as documentIdFieldPath,
   writeBatch,
-  addDoc
+  addDoc,
+  increment
 } from '../util/firebase_export';
 import { apiDescribe, withTestCollection, itIf } from '../util/helpers';
 import {
@@ -144,17 +145,16 @@ use(chaiAsPromised);
 setLogLevel('debug');
 
 const testUnsupportedFeatures = false;
+const timestampDeltaMS = 1000;
 
-apiDescribe.only('Pipelines', persistence => {
+apiDescribe('Pipelines', persistence => {
   addEqualityMatcher();
 
   let firestore: Firestore;
   let randomCol: CollectionReference;
   let beginDocCreation: number = 0;
   let endDocCreation: number = 0;
 
-  const timestampDeltaMS = 1000;
-
   async function testCollectionWithDocs(docs: {
     [id: string]: DocumentData;
   }): Promise<CollectionReference<DocumentData>> {
@@ -2388,7 +2388,7 @@ apiDescribe.only('Pipelines', persistence => {
           .collection(randomCol.path)
           .sort(field('rating').descending())
           .limit(1)
-          .select(
+          .addFields(
             map({
               foo: 'bar'
             }).as('metadata')

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

@@ -59,7 +59,7 @@ const testUnsupportedFeatures = false;
 
 // This is the Query integration tests from the lite API (no cache support)
 // with some additional test cases added for more complete coverage.
-apiDescribe.only('Query to Pipeline', persistence => {
+apiDescribe('Query to Pipeline', persistence => {
   addEqualityMatcher();
 
   function verifyResults(
@@ -632,7 +632,8 @@ apiDescribe.only('Query to Pipeline', persistence => {
       PERSISTENCE_MODE_UNSPECIFIED,
       {
         1: { foo: 1, bar: NaN },
-        2: { foo: 2, bar: 1 }
+        2: { foo: 2, bar: 1 },
+        3: { foo: 3, bar: 'bar' }
       },
       async (collRef, db) => {
         const query1 = query(collRef, where('bar', '==', NaN));
@@ -647,7 +648,8 @@ apiDescribe.only('Query to Pipeline', persistence => {
       PERSISTENCE_MODE_UNSPECIFIED,
       {
         1: { foo: 1, bar: NaN },
-        2: { foo: 2, bar: 1 }
+        2: { foo: 2, bar: 1 },
+        3: { foo: 3, bar: 'bar' }
       },
       async (collRef, db) => {
         const query1 = query(collRef, where('bar', '!=', NaN));