chore(tests): setup testing for AngularFirestore

Author: davideast

karma.conf.js

@@ -26,9 +26,11 @@ module.exports = function(config) {
 
       'karma-test-shim.js',
       'node_modules/firebase/firebase.js',
+      'node_modules/firestore/firestore.js',
       'dist/packages-dist/bundles/core.umd.{js,map}',
       'dist/packages-dist/bundles/auth.umd.{js,map}',
       'dist/packages-dist/bundles/database.umd.{js,map}',
+      'dist/packages-dist/bundles/firestore.umd.{js,map}',
       'dist/packages-dist/bundles/test.umd.{js,map}',
     ],
 

src/firestore/firestore.spec.ts

@@ -5,9 +5,9 @@ import * as firebase from 'firebase/app';
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from './test-config';
 
-describe('AngularFirestore', () => {
+fdescribe('AngularFirestore', () => {
   let app: firebase.app.App;
-  let db: AngularFirestore;
+  let afs: AngularFirestore;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -16,9 +16,9 @@ describe('AngularFirestore', () => {
         AngularFirestoreModule
       ]
     });
-    inject([FirebaseApp, AngularFirestore], (_app: firebase.app.App, _db: AngularFirestore) => {
+    inject([FirebaseApp, AngularFirestore], (_app: firebase.app.App, _afs: AngularFirestore) => {
       app = _app;
-      db = _db;
+      afs = _afs;
     })();
   });
 
@@ -28,4 +28,13 @@ describe('AngularFirestore', () => {
     // ref.remove(done);
   });
 
+  describe('AngularFirestore', () => {
+
+    // document
+    it('should have an initialized Firebase app', () => {
+      expect(afs.app).toBeDefined();
+    });
+
+  });
+
 });

src/firestore/firestore.ts

@@ -1,11 +1,7 @@
 import * as firebase from 'firebase/app';
-import * as firestore from 'firestore';
 import 'firestore';
-import { Firestore, CollectionReference, Query } from 'firestore';
+import { Firestore, CollectionReference, Query, DocumentSnapshot, QuerySnapshot } from 'firestore';
 import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
-import { Operator } from 'rxjs/Operator';
-import { Subscriber } from 'rxjs/Subscriber';
 import { Subscription } from 'rxjs/Subscription';
 
 import { Injectable } from '@angular/core';
@@ -19,7 +15,7 @@ export class AngularFirestore {
     this.firestore = app.firestore();
   }
 
-  collection(path: string, queryFn: (ref: CollectionReference) => Query = ref => ref): Observable<firestore.QuerySnapshot> {
+  collection(path: string, queryFn: (ref: CollectionReference) => Query = ref => ref): Observable<QuerySnapshot> {
     const ref = this.firestore.collection(path);
     const query = queryFn(ref);    
     return new Observable(subscriber => {
@@ -28,60 +24,11 @@ export class AngularFirestore {
     });
   }
 
-  doc(path: string): Observable<firestore.DocumentSnapshot> {
+  doc(path: string): Observable<DocumentSnapshot> {
     const ref = this.firestore.doc(path);
     return new Observable(subscriber => {
       const unsubscribe = ref.onSnapshot(subscriber);
       return new Subscription(unsubscribe);
     });
   }
-
-}
-
-export class FirestoreDocumentReferenceObservable<T> extends Observable<T> {
-  constructor(public originalRef: firestore.DocumentReference, subscribe?: <R>(subscriber: Subscriber<R>) => Subscription) {
-    super(subscribe);
-  }
-  
-  lift<T, R>(operator: Operator<T, R>): Observable<R> {
-    const observable = new FirestoreDocumentReferenceObservable<R>(this.originalRef);
-    observable.source = this;
-    observable.operator = operator;
-    observable.originalRef = this.originalRef;
-    return observable;
-  }
-}
-
-export class FirestoreCollectionReferenceObservable<T> extends Observable<T> {
-  constructor(public originalRef: firestore.CollectionReference, public query: firestore.Query, subscribe?: <R>(subscriber: Subscriber<R>) => Subscription) {
-    super(subscribe);
-  }
-  
-  lift<T, R>(operator: Operator<T, R>): Observable<R> {
-    const observable = new FirestoreCollectionReferenceObservable<R>(this.originalRef, this.query);
-    observable.source = this;
-    observable.operator = operator;
-    observable.query = this.query;
-    observable.originalRef = this.originalRef;
-    return observable;
-  }
 }
-
-/**
- *   collection(path: string, queryFn: (ref: CollectionReference) => Query = ref => ref): Observable<firestore.QuerySnapshot> {
-    const ref = this.firestore.collection(path);
-    const query = queryFn(ref);    
-    return new FirestoreCollectionReferenceObservable(ref, query, subscriber => {
-      const unsubscribe = query.onSnapshot(subscriber.next, subscriber.error, subscriber.complete);
-      return new Subscription(unsubscribe);
-    });
-  }
-
-  doc(path: string): Observable<firestore.DocumentSnapshot> {
-    const ref = this.firestore.doc(path);
-    return new FirestoreDocumentReferenceObservable(ref, subscriber => {
-      const unsubscribe = ref.onSnapshot(subscriber.next, subscriber.error, subscriber.complete);
-      return new Subscription(unsubscribe);
-    });
-  }
- */

src/firestore/index.spec.ts

@@ -0,0 +1 @@
+export * from './firestore.spec';

src/root.spec.js

@@ -6,3 +6,4 @@ export * from './packages-dist/database/firebase_list_observable.spec';
 export * from './packages-dist/database/firebase_object_observable.spec';
 export * from './packages-dist/database/query_observable.spec';
 export * from './packages-dist/auth/auth.spec';
+export * from './packages-dist/firestore/firestore.spec';

tools/build.js

@@ -40,7 +40,8 @@ const GLOBALS = {
   '@angular/core/testing': 'ng.core.testing',
   'angularfire2': 'angularfire2',
   'angularfire2/auth': 'angularfire2.auth',
-  'angularfire2/database': 'angularfire2.database'
+  'angularfire2/database': 'angularfire2.database',
+  'angularfire2/firestore': 'angularfire2.firestore'
 };
 
 // Map of dependency versions across all packages