From 750737ced50cb08fbfcbeb5c016cf114a691ffbb Mon Sep 17 00:00:00 2001
From: Nicholas Jamieson <nicholas@cartant.com>
Date: Fri, 31 Mar 2017 06:32:28 +1000
Subject: [PATCH] fix(database): Fix test TypeScript errors

Closes #875
---
 src/database/firebase_list_factory.spec.ts | 24 ++++++++--------------
 src/database/query_observable.spec.ts      |  4 ++--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/database/firebase_list_factory.spec.ts b/src/database/firebase_list_factory.spec.ts
index f250d82a1..e57f269cc 100644
--- a/src/database/firebase_list_factory.spec.ts
+++ b/src/database/firebase_list_factory.spec.ts
@@ -759,8 +759,7 @@ 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: {
@@ -768,10 +767,9 @@ describe('FirebaseListFactory', () => {
               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,8 +797,7 @@ 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: {
@@ -808,10 +805,9 @@ describe('FirebaseListFactory', () => {
               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,8 +835,7 @@ 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: {
@@ -848,10 +843,9 @@ describe('FirebaseListFactory', () => {
               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();
diff --git a/src/database/query_observable.spec.ts b/src/database/query_observable.spec.ts
index a056799ff..16ea57b27 100644
--- a/src/database/query_observable.spec.ts
+++ b/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);