feat(storage): Add tests

Author: davideast

karma.conf.js

@@ -31,6 +31,7 @@ module.exports = function(config) {
       '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/storage.umd.{js,map}',
       'dist/packages-dist/bundles/database-deprecated.umd.{js,map}',
       'dist/packages-dist/bundles/test.umd.{js,map}',
     ],

package.json

@@ -7,6 +7,7 @@
     "test": "npm run build && karma start --single-run",
     "test:watch": "concurrently \"npm run build:watch\" \"npm run delayed_karma\"",
     "test:debug": "npm run build && karma start",
+    "karma": "karma start",
     "test:universal": "npm run build && cp -R dist/packages-dist test/universal-test/node_modules/angularfire2 && cd test/universal-test && npm run prerender",
     "delayed_karma": "sleep 10 && karma start",
     "build": "rm -rf dist && node tools/build.js",

src/root.spec.js

@@ -11,6 +11,7 @@ export * from './packages-dist/database/list/changes.spec';
 export * from './packages-dist/database/list/snapshot-changes.spec';
 export * from './packages-dist/database/list/state-changes.spec';
 export * from './packages-dist/database/list/audit-trail.spec';
+export * from './packages-dist/storage/storage.spec';
 
 // export * from './packages-dist/database-deprecated/firebase_list_factory.spec';
 // export * from './packages-dist/database-deprecated/firebase_object_factory.spec';

src/storage/index.spec.ts

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

src/storage/observable/fromTask.ts

@@ -3,8 +3,12 @@ import 'firebase/storage';
 import { Observable } from 'rxjs/Observable';
 
 export function fromTask(task: storage.UploadTask) {
-  return new Observable<storage.UploadTaskSnapshot>(subscriber => {
-    task.on('state_changed', subscriber);
+  return new Observable<storage.UploadTaskSnapshot | undefined>(subscriber => {
+    task.on('state_changed', 
+      (snap: storage.UploadTaskSnapshot) => subscriber.next(snap),
+      e => subscriber.error(e),
+      () => subscriber.complete()
+    );
     return { unsubscribe: task.cancel };
   });
 }

src/storage/ref.ts

@@ -3,7 +3,7 @@ import { AngularFireUploadTask } from './task';
 
 export class AngularFireStorageRef {
   constructor(public ref: storage.Reference) { }
-  put(data: any, metadata: storage.UploadMetadata | undefined) {
+  put(data: any, metadata?: storage.UploadMetadata) {
     const task = this.ref.put(data, metadata);
     return new AngularFireUploadTask(task);
   }

src/storage/storage.spec.ts

@@ -0,0 +1,56 @@
+import * as firebase from 'firebase/app';
+import { Observable } from 'rxjs/Observable'
+import { Subject } from 'rxjs/Subject'
+import { TestBed, inject } from '@angular/core/testing';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
+import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, AngularFireStorageRef } from 'angularfire2/storage';
+import { COMMON_CONFIG } from './test-config';
+
+console.log(AngularFireStorageModule);
+
+fdescribe('AngularFireStorage', () => {
+  let app: firebase.app.App;
+  let afStorage: AngularFireStorage;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        AngularFireModule.initializeApp(COMMON_CONFIG),
+        AngularFireStorageModule
+      ]
+    });
+    inject([FirebaseApp, AngularFireStorage], (app_: FirebaseApp, _storage: AngularFireStorage) => {
+      app = app_;
+      afStorage = _storage;
+    })();
+  });
+
+  afterEach(done => {
+    app.delete().then(done, done.fail);
+  });
+
+  it('should exist', () => {
+    expect(afStorage instanceof AngularFireStorage).toBe(true);
+  });
+
+  it('should have the Firebase storage instance', () => {
+    expect(afStorage.storage).toBeDefined();
+  });
+
+  describe('AngularFireUploadTask', () => {
+
+    it('should upload a file', (done) => {
+      const data = { angular: "fire" };
+      const blob = new Blob([JSON.stringify(data)], { type : 'application/json' });
+      const task = afStorage.upload('af.json', blob);
+      const sub = task.snapshotChanges()
+        .subscribe(
+          snap => { console.log(snap); expect(snap).toBeDefined() },
+          e => { done.fail(); },
+          done);
+
+    });
+
+  });
+
+});

src/storage/storage.ts

@@ -17,7 +17,7 @@ export class AngularFireStorage {
       return new AngularFireStorageRef(this.storage.ref(path));
     }
 
-    upload(pathOrRef: string, data: any, metadata: storage.UploadMetadata | undefined) {
+    upload(pathOrRef: string, data: any, metadata?: storage.UploadMetadata) {
       const storageRef = this.storage.ref(pathOrRef);
       const ref = new AngularFireStorageRef(storageRef);
       return ref.put(data, metadata);

src/storage/test-config.ts

@@ -0,0 +1,9 @@
+
+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"
+};

src/tsconfig.json

@@ -14,6 +14,7 @@
       "angularfire2/auth": ["./auth"],
       "angularfire2/database": ["./database"],
       "angularfire2/firestore": ["./firestore"],
+      "angularfire2/storage": ["./storage"],
       "angularfire2/database-deprecated": ["./database-deprecated"]
     },
     "rootDir": ".",