Adding StorageBucket and DatabaseURL DI tests

Author: jamesdaniels

src/database/database.spec.ts

@@ -1,6 +1,6 @@
 import { FirebaseApp } from '@firebase/app-types';
-import { FirebaseAppConfig, AngularFireModule} from 'angularfire2';
-import { AngularFireDatabase, AngularFireDatabaseModule } from 'angularfire2/database';
+import { FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
+import { AngularFireDatabase, AngularFireDatabaseModule, RealtimeDatabaseURL } from 'angularfire2/database';
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from './test-config';
 
@@ -43,8 +43,51 @@ describe('AngularFireDatabase', () => {
       expect(db.database.app.name).toEqual(FIREBASE_APP_NAME);
     });
 
-    it('should have an initialized Firebase database instance member', () => {
-      expect(db.database.app.name).toEqual(FIREBASE_APP_NAME);
+  });
+
+});
+
+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/`;
+
+describe('AngularFireDatabase w/options', () => {
+  let app: FirebaseApp;
+  let db: AngularFireDatabase;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        AngularFireModule.initializeApp(COMMON_CONFIG, FIREBASE_APP_NAME),
+        AngularFireDatabaseModule
+      ],
+      providers: [
+        { provide: FirebaseAppName, useValue: FIREBASE_APP_NAME_TOO },
+        { provide: FirebaseAppConfig, useValue:  COMMON_CONFIG },
+        { provide: RealtimeDatabaseURL, useValue: FIREBASE_DB_NAME }
+      ]
+    });
+    inject([FirebaseApp, AngularFireDatabase], (app_: FirebaseApp, _db: AngularFireDatabase) => {
+      app = app_;
+      db = _db;
+    })();
+  });
+
+  afterEach(done => {
+    app.delete().then(done, done.fail);
+  });
+
+  describe('<constructor>', () => {
+
+    it('should be an AngularFireDatabase type', () => {
+      expect(db instanceof AngularFireDatabase).toEqual(true);
+    });
+
+    it('should have an initialized Firebase app instance member', () => {
+      expect(db.database.app.name).toEqual(FIREBASE_APP_NAME_TOO);
+    });
+
+    it('should be pointing to the provided DB instance', () => {
+      expect(db.database.ref().toString()).toEqual(FIREBASE_DB_NAME);
     });
   });
 

src/database/database.ts

@@ -55,3 +55,5 @@ export {
   Action,
   SnapshotAction
 } from './interfaces';
+
+export { RealtimeDatabaseURL };

src/storage/storage.spec.ts

@@ -2,8 +2,8 @@ import { FirebaseApp  } from '@firebase/app-types';
 import { Observable } from 'rxjs/Observable'
 import { forkJoin } from 'rxjs/observable/forkJoin';
 import { TestBed, inject } from '@angular/core/testing';
-import { FirebaseAppConfig, AngularFireModule } from 'angularfire2';
-import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask } from 'angularfire2/storage';
+import { FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
+import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, StorageBucket } from 'angularfire2/storage';
 import { COMMON_CONFIG } from './test-config';
 
 describe('AngularFireStorage', () => {
@@ -116,3 +116,54 @@ 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)}/`;
+
+describe('AngularFireStorage w/options', () => {
+  let app: FirebaseApp;
+  let afStorage: AngularFireStorage;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        AngularFireModule.initializeApp(COMMON_CONFIG),
+        AngularFireStorageModule
+      ],
+      providers: [
+        { provide: FirebaseAppName, useValue: FIREBASE_APP_NAME_TOO },
+        { provide: FirebaseAppConfig, useValue:  COMMON_CONFIG },
+        { provide: StorageBucket, useValue: FIREBASE_STORAGE_BUCKET }
+      ]
+    });
+    inject([FirebaseApp, AngularFireStorage], (app_: FirebaseApp, _storage: AngularFireStorage) => {
+      app = app_;
+      afStorage = _storage;
+    })();
+  });
+
+  afterEach(done => {
+    app.delete().then(done, done.fail);
+  });
+
+  describe('<constructor>', () => {
+   
+    it('should exist', () => {
+      expect(afStorage instanceof AngularFireStorage).toBe(true);
+    });
+
+    it('should have the Firebase storage instance', () => {
+      expect(afStorage.storage).toBeDefined();
+    });
+
+    it('should be hooked up the right app', () => {
+      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);
+    });
+
+  });
+
+});