Properly import DocumentReference in database.test.ts

Author: dconeybe

integration/firestore/firebase_export.ts

@@ -50,11 +50,22 @@ export function usesFunctionalApi(): false {
   return false;
 }
 
-const Firestore = firebase.firestore.Firestore;
+const Blob = firebase.firestore.Blob;
+const DocumentReference = firebase.firestore.DocumentReference;
 const FieldPath = firebase.firestore.FieldPath;
-const Timestamp = firebase.firestore.Timestamp;
-const GeoPoint = firebase.firestore.GeoPoint;
 const FieldValue = firebase.firestore.FieldValue;
-const Blob = firebase.firestore.Blob;
+const Firestore = firebase.firestore.Firestore;
+const GeoPoint = firebase.firestore.GeoPoint;
+const QueryDocumentSnapshot = firebase.firestore.QueryDocumentSnapshot;
+const Timestamp = firebase.firestore.Timestamp;
 
-export { Firestore, FieldValue, FieldPath, Timestamp, Blob, GeoPoint };
+export {
+  Blob,
+  DocumentReference,
+  FieldPath,
+  FieldValue,
+  Firestore,
+  GeoPoint,
+  QueryDocumentSnapshot,
+  Timestamp
+};

integration/firestore/firebase_export_memory.ts

@@ -50,11 +50,22 @@ export function usesFunctionalApi(): false {
   return false;
 }
 
-const Firestore = firebase.firestore.Firestore;
+const Blob = firebase.firestore.Blob;
+const DocumentReference = firebase.firestore.DocumentReference;
 const FieldPath = firebase.firestore.FieldPath;
-const Timestamp = firebase.firestore.Timestamp;
-const GeoPoint = firebase.firestore.GeoPoint;
 const FieldValue = firebase.firestore.FieldValue;
-const Blob = firebase.firestore.Blob;
+const Firestore = firebase.firestore.Firestore;
+const GeoPoint = firebase.firestore.GeoPoint;
+const QueryDocumentSnapshot = firebase.firestore.QueryDocumentSnapshot;
+const Timestamp = firebase.firestore.Timestamp;
 
-export { Firestore, FieldValue, FieldPath, Timestamp, Blob, GeoPoint };
+export {
+  Blob,
+  DocumentReference,
+  FieldPath,
+  FieldValue,
+  Firestore,
+  GeoPoint,
+  QueryDocumentSnapshot,
+  Timestamp
+};

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

@@ -39,6 +39,8 @@ const newTestFirestore = firebaseExport.newTestFirestore;
 const Timestamp = firebaseExport.Timestamp;
 const FieldPath = firebaseExport.FieldPath;
 const FieldValue = firebaseExport.FieldValue;
+const DocumentReference = firebaseExport.DocumentReference;
+const QueryDocumentSnapshot = firebaseExport.QueryDocumentSnapshot;
 
 const MEMORY_ONLY_BUILD =
   typeof process !== 'undefined' &&
@@ -1344,6 +1346,7 @@ apiDescribe('Database', (persistence: boolean) => {
         snapshot: firestore.QueryDocumentSnapshot,
         options: firestore.SnapshotOptions
       ): Post {
+        expect(snapshot).to.be.an.instanceof(QueryDocumentSnapshot);
         const data = snapshot.data(options);
         return new Post(data.title, data.author, snapshot.ref);
       }
@@ -1602,7 +1605,7 @@ apiDescribe('Database', (persistence: boolean) => {
         await docRef.set(new Post('post', 'author'));
         const docSnapshot = await docRef.get();
         const ref = docSnapshot.data()!.ref!;
-        //expect(ref).to.be.an.instanceof(firestore.DocumentReference);
+        expect(ref).to.be.an.instanceof(DocumentReference);
         expect(untypedDocRef.isEqual(ref)).to.be.true;
       });
     });
@@ -1619,7 +1622,7 @@ apiDescribe('Database', (persistence: boolean) => {
         const querySnapshot = await collection.get();
         expect(querySnapshot.size).to.equal(1);
         const ref = querySnapshot.docs[0].data().ref!;
-        //expect(ref).to.be.an.instanceof(firestore.DocumentReference);
+        expect(ref).to.be.an.instanceof(DocumentReference);
         const untypedDocRef = untypedCollection.doc(docRef.id);
         expect(untypedDocRef.isEqual(ref)).to.be.true;
       });
@@ -1637,7 +1640,7 @@ apiDescribe('Database', (persistence: boolean) => {
         const querySnapshot = await query.get();
         expect(querySnapshot.size).to.equal(1);
         const ref = querySnapshot.docs[0].data().ref!;
-        //expect(ref).to.be.an.instanceof(firestore.DocumentReference);
+        expect(ref).to.be.an.instanceof(DocumentReference);
         expect(untypedDocRef.isEqual(ref)).to.be.true;
       });
     });

packages/firestore/test/integration/util/firebase_export.ts

@@ -25,7 +25,11 @@ import { FirebaseApp } from '@firebase/app-types';
 import * as firestore from '@firebase/firestore-types';
 
 import { Blob } from '../../../src/api/blob';
-import { Firestore } from '../../../src/api/database';
+import {
+  Firestore,
+  DocumentReference,
+  QueryDocumentSnapshot
+} from '../../../src/api/database';
 import { FieldPath } from '../../../src/api/field_path';
 import { FieldValue } from '../../../src/api/field_value';
 import { GeoPoint } from '../../../src/api/geo_point';
@@ -68,4 +72,13 @@ export function newTestFirestore(
   return firestore;
 }
 
-export { Firestore, FieldValue, FieldPath, Timestamp, Blob, GeoPoint };
+export {
+  Firestore,
+  FieldValue,
+  FieldPath,
+  Timestamp,
+  Blob,
+  GeoPoint,
+  DocumentReference,
+  QueryDocumentSnapshot
+};