More complete tests + fixed the storage test config

Author: jamesdaniels

src/database/database.spec.ts

@@ -48,7 +48,8 @@ describe('AngularFireDatabase', () => {
 });
 
 const FIREBASE_APP_NAME_TOO = (Math.random() + 1).toString(36).substring(7);
-const FIREBASE_DB_NAME = `https://test-${(Math.random() + 1).toString(36).substring(7)}.firebaseio.com/`;
+const FIREBASE_DB_NAME = `https://angularfire2-test2.firebaseio.com/`;
+const QUERY = (Math.random() + 1).toString(36).substring(7)
 
 describe('AngularFireDatabase w/options', () => {
   let app: FirebaseApp;
@@ -86,9 +87,17 @@ describe('AngularFireDatabase w/options', () => {
       expect(db.database.app.name).toEqual(FIREBASE_APP_NAME_TOO);
     });
 
-    it('should be pointing to the provided DB instance', () => {
+    it('database be pointing to the provided DB instance', () => {
       expect(db.database.ref().toString()).toEqual(FIREBASE_DB_NAME);
     });
+
+    it('list should be using the provided DB instance', () => {
+      expect(db.list(QUERY).query.toString()).toEqual(`${FIREBASE_DB_NAME}${QUERY}`);
+    });
+
+    it('object should be using the provided DB instance', () => {
+      expect(db.object(QUERY).query.toString()).toEqual(`${FIREBASE_DB_NAME}${QUERY}`);
+    });
   });
 
 });

src/storage/storage.spec.ts

@@ -54,7 +54,7 @@ describe('AngularFireStorage', () => {
     it('should upload a file and observe the download url', (done) => {
       const data = { angular: "fire" };
       const blob = new Blob([JSON.stringify(data)], { type : 'application/json' });
-      const ref = afStorage.ref('afs.json');
+      const ref = afStorage.ref('af.json');
       const task = ref.put(blob);
       const url$ = task.downloadURL();
       url$.subscribe(
@@ -67,7 +67,7 @@ describe('AngularFireStorage', () => {
     it('should resolve the task as a promise', (done) => {
       const data = { angular: "promise" };
       const blob = new Blob([JSON.stringify(data)], { type : 'application/json' });
-      const ref = afStorage.ref('afs.json');
+      const ref = afStorage.ref('af.json');
       const task: AngularFireUploadTask = ref.put(blob);
       task.then(snap => { 
         expect(snap).toBeDefined(); 
@@ -118,7 +118,7 @@ describe('AngularFireStorage', () => {
 });
 
 const FIREBASE_APP_NAME_TOO = (Math.random() + 1).toString(36).substring(7);
-const FIREBASE_STORAGE_BUCKET = `gs://test-${(Math.random() + 1).toString(36).substring(7)}/`;
+const FIREBASE_STORAGE_BUCKET = 'angularfire2-test2';
 
 describe('AngularFireStorage w/options', () => {
   let app: FirebaseApp;
@@ -160,8 +160,25 @@ describe('AngularFireStorage w/options', () => {
       expect(afStorage.storage.app.name).toEqual(FIREBASE_APP_NAME_TOO);
     });
 
-    it('should be pointing towards a different bucket', () => {
-      expect(afStorage.storage.ref().toString()).toEqual(FIREBASE_STORAGE_BUCKET);
+    it('storage be pointing towards a different bucket', () => {
+      expect(afStorage.storage.ref().toString()).toEqual( `gs://${FIREBASE_STORAGE_BUCKET}/`);
+    });
+
+    it('it should upload, download, and delete', (done) => {
+      const data = { angular: "fire" };
+      const blob = new Blob([JSON.stringify(data)], { type : 'application/json' });
+      const ref = afStorage.ref('af.json');
+      const task = ref.put(blob);
+      // Wait for the upload
+      const sub = forkJoin(task.snapshotChanges())
+        // get the url download
+        .mergeMap(() => ref.getDownloadURL())
+        // assert the URL
+        .do(url => expect(url).toMatch(new RegExp(`https:\\/\\/firebasestorage\\.googleapis\\.com\\/v0\\/b\\/${FIREBASE_STORAGE_BUCKET}\\/o\\/af\\.json`)))
+        // Delete the file
+        .mergeMap(url => ref.delete())
+        // finish the test
+        .subscribe(done, done.fail);
     });
 
   });

src/storage/test-config.ts

@@ -1,9 +1,7 @@
-
 export const COMMON_CONFIG = {
-  apiKey: "AIzaSyAcDzMU79ou1QE5OvZm4JfpfkM8f2gwPno",
-  authDomain: "day-of.firebaseapp.com",
-  databaseURL: "https://day-of.firebaseio.com",
-  projectId: "day-of",
-  storageBucket: "day-of.appspot.com",
-  messagingSenderId: "131965932953"
+  apiKey: "AIzaSyBVSy3YpkVGiKXbbxeK0qBnu3-MNZ9UIjA",
+  authDomain: "angularfire2-test.firebaseapp.com",
+  databaseURL: "https://angularfire2-test.firebaseio.com",
+  projectId: "angularfire2-test",
+  storageBucket: "angularfire2-test.appspot.com",
 };