chore(build): Use modules in test files

Author: davideast

.travis.yml

@@ -27,12 +27,8 @@ before_script:
 script:
   - npm run build
   - ./node_modules/.bin/karma start --single-run --browsers Firefox --reporters mocha
-  # Make sure the build that ships to npm builds without errors
-  - npm run build_npm
   # Run integration test to make sure our typings are correct for user-land.
   - node tools/run-typings-test.js
-  # Can't run until https://github.com/angular/protractor/issues/2784 is resolved
-  #- ./node_modules/.bin/protractor protractor.conf.js --browser firefox
 
 notifications:
   webhooks:

karma.conf.js

@@ -27,6 +27,8 @@ module.exports = function(config) {
       'karma-test-shim.js',
       'node_modules/firebase/firebase.js',
       'dist/packages-dist/bundles/core.umd.{js,map}',
+      'dist/packages-dist/bundles/auth.umd.{js,map}',
+      'dist/packages-dist/bundles/database.umd.{js,map}',
       'dist/packages-dist/bundles/test.umd.{js,map}',
     ],
 

package.json

@@ -41,7 +41,8 @@
     "@angular/platform-browser": "^4.0.0",
     "@angular/platform-browser-dynamic": "^4.0.0",
     "firebase": "^4.0.0",
-    "rxjs": "^5.0.1"
+    "rxjs": "^5.0.1",
+    "zone.js": "^0.8.0"
   },
   "devDependencies": {
     "@angular/compiler-cli": "^4.0.0",
@@ -79,8 +80,7 @@
     "systemjs": "^0.19.16",
     "systemjs-builder": "^0.15.7",
     "traceur": "0.0.96",
-    "typescript": "^2.3.2",
-    "zone.js": "^0.8.0"
+    "typescript": "^2.3.4"
   },
   "typings": "index.d.ts"
 }

src/auth/auth.spec.ts

@@ -8,8 +8,7 @@ import { _do } from 'rxjs/operator/do';
 import { take } from 'rxjs/operator/take';
 import { skip } from 'rxjs/operator/skip';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
-import { AngularFireAuth } from './auth';
-import { AngularFireAuthModule } from './auth.module';
+import { AngularFireAuth, AngularFireAuthModule } from 'angularfire2/auth';
 import { COMMON_CONFIG } from './test-config';
 
 function authTake(auth: Observable<any>, count: number): Observable<any> {

src/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angularfire2/auth",
-  "version": "4.0.0-rc.1",
+  "version": "ANGULARFIRE2_VERSION",
   "description": "The auth module",
   "main": "../bundles/auth.umd.js",
   "module": "index.js",

src/auth/tsconfig-build.json

@@ -13,10 +13,7 @@
     "declaration": false,
     "removeComments": true,
     "strictNullChecks": true,
-    "lib": [
-      "es2015",
-      "dom"
-    ],
+    "lib": ["es2015", "dom", "es2015.promise", "es2015.collection", "es2015.iterable"],
     "skipLibCheck": true,
     "moduleResolution": "node",
     "paths": {

src/core/angularfire2.ts

@@ -42,9 +42,9 @@ export class AngularFireModule {
  * with zones.
  */
 export class ZoneScheduler {
-  constructor(public zone: any) {}
+  constructor(public zone: Zone) {}
 
-  schedule(...args): Subscription {
+  schedule(...args: any[]): Subscription {
     return <Subscription>this.zone.run(() => queue.schedule.apply(queue, args));
   }
 }

src/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angularfire2",
-  "version": "4.0.0-rc.2",
+  "version": "ANGULARFIRE2_VERSION",
   "description": "The core module",
   "main": "./bundles/core.umd.js",
   "module": "index.js",

src/core/tsconfig-build.json

@@ -12,10 +12,7 @@
     "declaration": false,
     "removeComments": true,
     "strictNullChecks": true,
-    "lib": [
-      "es2015",
-      "dom"
-    ],
+    "lib": ["es2015", "dom", "es2015.promise", "es2015.collection", "es2015.iterable"],
     "skipLibCheck": true,
     "moduleResolution": "node"
   },

src/database/firebase_list_factory.spec.ts

@@ -1,10 +1,9 @@
 import * as firebase from 'firebase/app';
-import { AngularFireDatabase } from './database';
-import { AngularFireDatabaseModule } from './database.module';
-import { FirebaseListObservable } from './firebase_list_observable';
-import { FirebaseListFactory, onChildAdded, onChildChanged, onChildRemoved, onChildUpdated } from './firebase_list_factory';
-import { FirebaseObjectFactory } from './firebase_object_factory';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from 'angularfire2';
+import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseListObservable, 
+  FirebaseListFactory, onChildAdded, onChildChanged, onChildRemoved, onChildUpdated, 
+  FirebaseObjectFactory 
+} from 'angularfire2/database';
 import { TestBed, inject } from '@angular/core/testing';
 import * as utils from './utils';
 import { Query, AFUnwrappedDataSnapshot } from './interfaces';
@@ -22,7 +21,7 @@ const questionsPath = 'questions';
 function queryTest(observable: Observable<any>, subject: Subject<any>, done: any) {
   let nexted = false;
   skipAndTake(observable, 2)
-    .subscribe(val => {
+    .subscribe((val: any) => {
       if (!nexted) {
         subject.next('2');
       }
@@ -364,7 +363,7 @@ describe('FirebaseListFactory', () => {
 
   describe('methods', () => {
 
-    let toKey;
+    let toKey: any;
     let val1: any;
     let val2: any;
     let val3: any;
@@ -375,7 +374,7 @@ describe('FirebaseListFactory', () => {
     let subscription: Subscription;
 
     beforeEach((done: any) => {
-      toKey = (val) => val.key;
+      toKey = (val: any) => val.key;
       val1 = { key: 'key1' };
       val2 = { key: 'key2' };
       val3 = { key: 'key3' };
@@ -419,9 +418,9 @@ describe('FirebaseListFactory', () => {
           let calls: string[] = [];
           questions.$ref.ref.once('child_added', (snap) => calls.push('child_added:' + snap.val().number));
           skipAndTake(questions).subscribe(
-            (list) => {
+            (list: any) => {
               expect(calls).toEqual(['child_added:2', 'pushed']);
-              expect(list.map(i => i.number)).toEqual([1, 2]);
+              expect(list.map((i: any) => i.number)).toEqual([1, 2]);
               done();
             },
             done.fail
@@ -481,10 +480,10 @@ describe('FirebaseListFactory', () => {
 
     it('should re-emit identical instances of unchanged children', (done: any) => {
 
-      let prev;
+      let prev: any;
 
       take.call(questions, 2).subscribe(
-        (list) => {
+        (list: any) => {
           if (prev) {
             expect(list[0]).toBe(prev[0]);
             done();
@@ -501,10 +500,10 @@ describe('FirebaseListFactory', () => {
 
     it('should re-emit identical instances of unchanged children as snapshots', (done: any) => {
 
-      let prev;
+      let prev: any;
 
       take.call(questionsSnapshotted, 2).subscribe(
-        (list) => {
+        (list: any) => {
           if (prev) {
             expect(list[0]).toBe(prev[0]);
             done();
@@ -536,7 +535,7 @@ describe('FirebaseListFactory', () => {
         });
 
         take.call(query, 1).subscribe(
-          (list) => {
+          (list: any) => {
             expect(list.length).toEqual(1);
             expect(list[0].$key).toEqual("val1");
             done();
@@ -565,7 +564,7 @@ describe('FirebaseListFactory', () => {
         });
 
         take.call(query, 1).subscribe(
-          (list) => {
+          (list: any) => {
             expect(list.length).toEqual(1);
             expect(list[0].$key).toEqual("val1");
             done();
@@ -685,7 +684,7 @@ describe('FirebaseListFactory', () => {
         // Creating a new observable so that the current zone is captured.
         subscription = FirebaseListFactory(app.database().ref(`questions`))
           .filter(d => d
-            .map(v => v.$value)
+            .map((v: any) => v.$value)
             .indexOf('in-the-zone') > -1)
           .subscribe(data => {
             expect(Zone.current.name).toBe('newZone');
@@ -763,8 +762,8 @@ describe('FirebaseListFactory', () => {
           let promise2 = toPromise.call(take.call(query2, 1));
 
           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']);
+            expect(list1.map((i: any) => i.$key)).toEqual(['val1', 'val2', 'val3']);
+            expect(list2.map((i: any) => i.$key)).toEqual(['val2', 'val3']);
             done();
           });
         })
@@ -801,8 +800,8 @@ describe('FirebaseListFactory', () => {
           let promise2 = toPromise.call(take.call(query2, 1));
 
           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']);
+            expect(list1.map((i: any) => i.$key)).toEqual(['val1', 'val2', 'val3']);
+            expect(list2.map((i: any) => i.$key)).toEqual(['val2']);
             done();
           });
         })
@@ -839,8 +838,8 @@ describe('FirebaseListFactory', () => {
           let promise2 = toPromise.call(take.call(query2, 1));
 
           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']);
+            expect(list1.map((i: any) => i.$key)).toEqual(['val1', 'val2', 'val3']);
+            expect(list2.map((i: any) => i.$key)).toEqual(['val1', 'val2']);
             done();
           });
         })
@@ -867,7 +866,7 @@ describe('FirebaseListFactory', () => {
             }
           });
 
-          query = map.call(query, (list, index) => {
+          query = map.call(query, (list: any, index: any) => {
             switch (index) {
             case 0:
               subject.next(true);
@@ -886,8 +885,8 @@ describe('FirebaseListFactory', () => {
           query = take.call(query, 3);
           query = toArray.call(query);
 
-          toPromise.call(query).then((emits) => {
-            expect(emits.map(e => e.map(i => i.$key))).toEqual([
+          toPromise.call(query).then((emits: any) => {
+            expect(emits.map((e: any) => e.map((i: any) => i.$key))).toEqual([
               ['key1'],
               ['key2'],
               ['key2', 'key4']

src/database/firebase_list_observable.spec.ts

@@ -1,12 +1,10 @@
-import { AngularFireDatabase } from './database';
-import { AngularFireDatabaseModule } from './database.module';
-import { FirebaseListObservable } from './firebase_list_observable';
-import { FirebaseObjectFactory } from './firebase_object_factory';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from 'angularfire2';
+import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseListObservable, FirebaseObjectFactory } from 'angularfire2/database';
 import { Observer } from 'rxjs/Observer';
 import { map } from 'rxjs/operator/map';
 import * as firebase from 'firebase/app';
 import { unwrapMapFn } from './utils';
-import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from 'angularfire2';
+
 import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from './test-config';
 

src/database/firebase_object_factory.spec.ts

@@ -1,11 +1,8 @@
 import * as firebase from 'firebase/app';
 import { Subscription } from 'rxjs';
-import { AngularFireDatabase } from './database';
-import { AngularFireDatabaseModule } from './database.module';
-import { FirebaseObjectObservable } from './firebase_object_observable';
-import { FirebaseObjectFactory } from './firebase_object_factory';
-import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
+import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseObjectObservable, FirebaseObjectFactory } from 'angularfire2/database';
+import { TestBed, inject } from '@angular/core/testing';
 import { COMMON_CONFIG } from './test-config';
 
 describe('FirebaseObjectFactory', () => {
@@ -16,7 +13,7 @@ describe('FirebaseObjectFactory', () => {
   let nextSpy: jasmine.Spy;
   let app: firebase.app.App;
   let db: AngularFireDatabase;
-
+  
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [

src/database/firebase_object_observable.spec.ts

@@ -1,9 +1,7 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
 import { COMMON_CONFIG } from './test-config';
-import { AngularFireDatabase } from './database';
-import { AngularFireDatabaseModule } from './database.module';
-import { FirebaseObjectObservable } from './firebase_object_observable';
+import { AngularFireDatabase, AngularFireDatabaseModule, FirebaseObjectObservable } from 'angularfire2/database';
 import { Observer } from 'rxjs/Observer';
 import { map } from 'rxjs/operator/map';
 import * as firebase from 'firebase/app';

src/database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angularfire2/database",
-  "version": "4.0.0-rc.1",
+  "version": "ANGULARFIRE2_VERSION",
   "description": "The database module",
   "main": "../bundles/database.umd.js",
   "module": "index.js",

src/database/query_observable.spec.ts

@@ -2,7 +2,7 @@ import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import { Subject } from 'rxjs/Subject';
 import { Query, ScalarQuery } from './interfaces';
-import { getOrderObservables, observeQuery } from './query_observable';
+import { getOrderObservables, observeQuery } from 'angularfire2/database';
 
 function scalarQueryTest(query: ScalarQuery, done: any) {
   const queryObservable = observeQuery(query);

src/database/tsconfig-build.json

@@ -13,10 +13,7 @@
     "declaration": false,
     "removeComments": true,
     "strictNullChecks": true,
-    "lib": [
-      "es2015",
-      "dom"
-    ],
+    "lib": ["es2015", "dom", "es2015.promise", "es2015.collection", "es2015.iterable"],
     "skipLibCheck": true,
     "moduleResolution": "node",
     "paths": {

src/tsconfig.json

@@ -1,15 +1,24 @@
 {
   "compilerOptions": {
+    "baseUrl": ".",
+    "declaration": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "strictNullChecks": true,
+    "noImplicitAny": false,
+    "noFallthroughCasesInSwitch": true,
     "paths": {
       "angularfire2": ["./core"],
       "angularfire2/auth": ["./auth"],
       "angularfire2/database": ["./database"]
-    }
-  },
-  "files": [
-    "../../node_modules/zone.js/dist/zone.js.d.ts",
-    "core/index.ts",
-    "auth/index.ts",
-    "database/index.ts"
-  ]
+    },
+    "rootDir": ".",
+    "inlineSourceMap": true,
+    "lib": ["es5", "dom", "es2015.promise", "es2015.collection", "es2015.iterable"],
+    "skipDefaultLibCheck": true,
+    "skipLibCheck": true,
+    "target": "es2015"
+  }
 }

src/types.d.ts

@@ -0,0 +1 @@
+/// <reference path="../node_modules/zone.js/dist/zone.js.d.ts" />