chore(lint): Clean database + utils

Author: NothingEverHappens

src/database/database.spec.ts

@@ -5,6 +5,7 @@ import { COMMON_CONFIG } from '../test-config';
 import { NgZone } from '@angular/core';
 import 'firebase/database';
 import { rando } from '../firestore/utils.spec';
+import { Test } from 'tslint';
 
 describe('AngularFireDatabase', () => {
   let app: FirebaseApp;
@@ -23,11 +24,10 @@ describe('AngularFireDatabase', () => {
         { provide: URL, useValue: 'http://localhost:9000'}
       ]
     });
-    inject([FirebaseApp, AngularFireDatabase, NgZone], (app_: FirebaseApp, _db: AngularFireDatabase, _zone: NgZone) => {
-      app = app_;
-      db = _db;
-      zone = _zone;
-    })();
+
+    app = TestBed.inject(FirebaseApp);
+    db = TestBed.inject(AngularFireDatabase);
+    zone = TestBed.inject(NgZone);
   });
 
   afterEach(() => {
@@ -45,9 +45,9 @@ describe('AngularFireDatabase', () => {
     });
 
     it('should accept a Firebase App in the constructor', (done) => {
-      const __db = new AngularFireDatabase(app.options, rando(), undefined!, {}, zone);
-      expect(__db instanceof AngularFireDatabase).toEqual(true);
-      __db.database.app.delete().then(done, done);
+      const database = new AngularFireDatabase(app.options, rando(), undefined, {}, zone);
+      expect(database instanceof AngularFireDatabase).toEqual(true);
+      database.database.app.delete().then(done, done);
     });
 
     it('should have an initialized Firebase app instance member', () => {

src/database/database.ts

@@ -23,6 +23,7 @@ export class AngularFireDatabase {
     @Inject(FIREBASE_OPTIONS) options: FirebaseOptions,
     @Optional() @Inject(FIREBASE_APP_NAME) nameOrConfig: string|FirebaseAppConfig|null|undefined,
     @Optional() @Inject(URL) databaseURL: string|null,
+    // tslint:disable-next-line:ban-types
     @Inject(PLATFORM_ID) platformId: Object,
     zone: NgZone
   ) {

src/database/utils.spec.ts

@@ -11,11 +11,12 @@ describe('utils', () => {
       const nul = null;
       const obj = {};
       const fn = () => { };
-      let undef;
+      const undef = undefined;
       expect(utils.isString(str)).toBe(true);
       expect(utils.isString(notStr)).toBe(false);
       expect(utils.isString(bool)).toBe(false);
       expect(utils.isString(nul)).toBe(false);
+      expect(utils.isString(obj)).toBe(false);
       expect(utils.isString(fn)).toBe(false);
       expect(utils.isString(undef)).toBe(false);
     });

src/database/utils.ts

@@ -20,8 +20,8 @@ export function isFirebaseRef(value: any): boolean {
 /**
  * Returns a database reference given a Firebase App and an
  * absolute or relative path.
- * @param app - Firebase App
- * @param path - Database path, relative or absolute
+ * @param database - Firebase Database
+ * @param pathRef - Database path, relative or absolute
  */
 export function getRef(database: database.Database, pathRef: PathReference): DatabaseReference {
   // if a db ref was passed in, just return it
@@ -33,9 +33,9 @@ export function checkOperationCases(item: FirebaseOperation, cases: FirebaseOper
   if (isString(item)) {
     return cases.stringCase();
   } else if (isFirebaseRef(item)) {
-    return cases.firebaseCase!();
+    return cases.firebaseCase();
   } else if (isFirebaseDataSnapshot(item)) {
-    return cases.snapshotCase!();
+    return cases.snapshotCase();
   }
   throw new Error(`Expects a string, snapshot, or reference. Got: ${typeof item}`);
 }