fix(database): Fix test TypeScript errors

Closes #875

Author: cartant

src/database/firebase_list_factory.spec.ts

@@ -759,19 +759,17 @@ describe('FirebaseListFactory', () => {
               startAt: { value: 0 }
             }
           });
-          query1 = take.call(query1, 1);
-          query1 = toPromise.call(query1);
+          let promise1 = toPromise.call(take.call(query1, 1));
 
           let query2 = FirebaseListFactory(`questions`, {
             query: {
               orderByChild: 'data',
               startAt: { value: 0, key: 'val2' }
             }
           });
-          query2 = take.call(query2, 1);
-          query2 = toPromise.call(query2);
+          let promise2 = toPromise.call(take.call(query2, 1));
 
-          Promise.all([query1, query2]).then(([list1, list2]) => {
+          Promise.all([promise1, promise2]).then(([list1, list2]) => {
             expect(list1.map(i => i.$key)).toEqual(['val1', 'val2', 'val3']);
             expect(list2.map(i => i.$key)).toEqual(['val2', 'val3']);
             done();
@@ -799,19 +797,17 @@ describe('FirebaseListFactory', () => {
               equalTo: { value: 0 }
             }
           });
-          query1 = take.call(query1, 1);
-          query1 = toPromise.call(query1);
+          let promise1 = toPromise.call(take.call(query1, 1));
 
           let query2 = FirebaseListFactory(`questions`, {
             query: {
               orderByChild: 'data',
               equalTo: { value: 0, key: 'val2' }
             }
           });
-          query2 = take.call(query2, 1);
-          query2 = toPromise.call(query2);
+          let promise2 = toPromise.call(take.call(query2, 1));
 
-          Promise.all([query1, query2]).then(([list1, list2]) => {
+          Promise.all([promise1, promise2]).then(([list1, list2]) => {
             expect(list1.map(i => i.$key)).toEqual(['val1', 'val2', 'val3']);
             expect(list2.map(i => i.$key)).toEqual(['val2']);
             done();
@@ -839,19 +835,17 @@ describe('FirebaseListFactory', () => {
               endAt: { value: 0 }
             }
           });
-          query1 = take.call(query1, 1);
-          query1 = toPromise.call(query1);
+          let promise1 = toPromise.call(take.call(query1, 1));
 
           let query2 = FirebaseListFactory(`questions`, {
             query: {
               orderByChild: 'data',
               endAt: { value: 0, key: 'val2' }
             }
           });
-          query2 = take.call(query2, 1);
-          query2 = toPromise.call(query2);
+          let promise2 = toPromise.call(take.call(query2, 1));
 
-          Promise.all([query1, query2]).then(([list1, list2]) => {
+          Promise.all([promise1, promise2]).then(([list1, list2]) => {
             expect(list1.map(i => i.$key)).toEqual(['val1', 'val2', 'val3']);
             expect(list2.map(i => i.$key)).toEqual(['val1', 'val2']);
             done();

src/database/query_observable.spec.ts

@@ -1,10 +1,10 @@
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import { Subject } from 'rxjs/Subject';
-import { Query } from '../interfaces';
+import { Query, ScalarQuery } from '../interfaces';
 import { getOrderObservables, observeQuery } from './index';
 
-function scalarQueryTest(query: Query, done: any) {
+function scalarQueryTest(query: ScalarQuery, done: any) {
   const queryObservable = observeQuery(query);
   queryObservable.subscribe(result => {
     expect(result).toEqual(query);