test(e2e): fix typescript config and build of examples

Author: jeffbcross

package.json

@@ -13,7 +13,7 @@
     "rewrite_npm_package": "node --harmony_destructuring tools/rewrite-published-package.js",
     "build_bundle": "cp -r src angularfire2 && tsc typings/main.d.ts angularfire2.ts --rootDir . --module system -t es5 --outFile dist/bundles/angularfire2.js  --moduleResolution node --emitDecoratorMetadata --experimentalDecorators",
     "e2e_test": "webdriver-manager update && npm run build_e2e && protractor",
-    "build_e2e": "npm run build && tsc -p test/ && cp test/e2e/firebase_object/index.html dist-test/e2e/firebase_object/ && cp test/e2e/firebase_list/index.html dist-test/e2e/firebase_list/ && cp test/e2e/auth/index.html dist-test/e2e/auth/"
+    "build_e2e": "rm -rf dist-test && npm run build && tsc -p test/ && cp test/e2e/firebase_object/index.html dist-test/e2e/firebase_object/ && cp test/e2e/firebase_list/index.html dist-test/e2e/firebase_list/ && cp test/e2e/auth/index.html dist-test/e2e/auth/"
   },
   "keywords": [
     "angular2",

test/e2e/auth/firebase_auth_example.ts

@@ -7,12 +7,23 @@ import {
   AngularFire,
   FIREBASE_PROVIDERS,
   FirebaseListObservable,
+  FirebaseAuthState,
   FirebaseApp
-} from '../../../dist/angularfire2';
+} from 'angularfire2';
 
 enableProdMode();
 
-import { COMMON_CONFIG } from '../../../src/test-config';
+// TODO fix imports and tsconfig
+// import { COMMON_CONFIG } from 'angularfire2/test-config';
+
+import 'rxjs/add/operator/do';
+
+const COMMON_CONFIG = {
+  apiKey: "AIzaSyBVSy3YpkVGiKXbbxeK0qBnu3-MNZ9UIjA",
+  authDomain: "angularfire2-test.firebaseapp.com",
+  databaseURL: "https://angularfire2-test.firebaseio.com",
+  storageBucket: "angularfire2-test.appspot.com"
+};
 
 @Component({
   template: `
@@ -80,18 +91,27 @@ import { COMMON_CONFIG } from '../../../src/test-config';
       {{ user?.providerData && user.providerData[0] | json }}
       <span *ngIf="!user || !user.providerData">Not Logged In</span>
     </blockquote>
+
+    <blockquote>
+      <h2>User</h2>
+      (Empty object is equivalent to null).
+      {{ user || {} | json }}
+    </blockquote>
   `,
   selector: 'app'
 })
 class App {
-  user: any;
+  user: FirebaseAuthState;
   questions: FirebaseListObservable<any>;
   constructor(public af: AngularFire) {
     af.auth
-      .subscribe(user => {
-        console.log('onAuth', user);
-        this.user = user
-      });
+      .do(v => console.log('onAuth', v))
+      .map(u => {
+        return Object.assign({}, u, {
+          auth: null // makes easier to convert to json
+        })
+      })
+      .subscribe(user => this.user = user);
   }
 
   signInAnonymously() {

test/e2e/firebase_list/firebase_list_example.ts

@@ -10,7 +10,15 @@ import {
 
 enableProdMode();
 
-import { COMMON_CONFIG } from '../../../src/test-config';
+// TODO fix imports and tsconfig
+// import { COMMON_CONFIG } from '../../../src/test-config';
+
+const COMMON_CONFIG = {
+    apiKey: "AIzaSyBVSy3YpkVGiKXbbxeK0qBnu3-MNZ9UIjA",
+    authDomain: "angularfire2-test.firebaseapp.com",
+    databaseURL: "https://angularfire2-test.firebaseio.com",
+    storageBucket: "angularfire2-test.appspot.com",
+};
 
 @Component({
   template: `

test/e2e/firebase_object/firebase_object_example.ts

@@ -8,7 +8,16 @@ import {
   FirebaseApp
 } from 'angularfire2';
 
-import { COMMON_CONFIG } from '../../../src/test-config';
+// TODO fix imports and tsconfig
+// import { COMMON_CONFIG } from '../../../src/test-config';
+
+const COMMON_CONFIG = {
+    apiKey: "AIzaSyBVSy3YpkVGiKXbbxeK0qBnu3-MNZ9UIjA",
+    authDomain: "angularfire2-test.firebaseapp.com",
+    databaseURL: "https://angularfire2-test.firebaseio.com",
+    storageBucket: "angularfire2-test.appspot.com",
+};
+
 
 enableProdMode();
 

test/tsconfig.json

@@ -9,14 +9,12 @@
     "declaration": true,
     "removeComments": true,
     "baseUrl": ".",
+    "rootDir": ".",
     "outDir": "../dist-test",
     "paths": {
       "angularfire2": [
         "../dist/*",
         "../dist/angularfire2.d.ts"
-      ],
-      "test/config": [
-        "./config.ts"
       ]
     }
   }