Update integration test (#209)

Author: laurenzlong

.gitignore

@@ -7,6 +7,7 @@ firebase-functions-*.tgz
 integration_test/.firebaserc
 integration_test/*.log
 integration_test/functions/firebase-functions.tgz
+integration_test/functions/package.json
 lib
 node_modules
 npm-debug.log

integration_test/functions/src/index.ts

@@ -1,5 +1,4 @@
 import * as functions from 'firebase-functions';
-import * as firebase from 'firebase';
 import * as https from 'https';
 import * as admin from 'firebase-admin';
 import { Request, Response } from 'express';
@@ -16,8 +15,8 @@ const numTests = Object.keys(exports).length; // Assumption: every exported func
 
 import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213)
 const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG);
-firebase.initializeApp(firebaseConfig);
 admin.initializeApp();
+admin.firestore().settings({ timestampsInSnapshots: true });
 
 // TODO(klimt): Get rid of this once the JS client SDK supports callable triggers.
 function callHttpsTrigger(name: string, data: any) {
@@ -52,14 +51,15 @@ export const integrationTests: any = functions
   .https.onRequest((req: Request, resp: Response) => {
     let pubsub: any = require('@google-cloud/pubsub')();
 
-    const testId = firebase
+    const testId = admin
       .database()
       .ref()
       .push().key;
+    console.log('testId is: ', testId);
+
     return Promise.all([
       // A database write to trigger the Firebase Realtime Database tests.
-      // The database write happens without admin privileges.
-      firebase
+      admin
         .database()
         .ref(`dbTests/${testId}/start`)
         .set({ '.sv': 'timestamp' }),

integration_test/functions/src/testing.ts

@@ -19,7 +19,7 @@ export class TestSuite<T> {
     return this;
   }
 
-  run(testId: string, data: T, context?: EventContext): Promise<void> {
+  run(testId: string, data: T, context?: EventContext): Promise<any> {
     let running: Array<Promise<any>> = [];
     for (let testName in this.tests) {
       if (!this.tests.hasOwnProperty(testName)) {
@@ -41,20 +41,18 @@ export class TestSuite<T> {
         );
       running.push(run);
     }
-    return Promise.all(running)
-      .then(results => {
-        let sum = 0;
-        results.forEach(val => (sum = sum + val.passed));
-        const summary = `passed ${sum} of ${running.length}`;
-        const passed = sum === running.length;
-        console.log(summary);
-        const result = { passed, summary, tests: results };
-        return firebase
-          .database()
-          .ref(`testRuns/${testId}/${this.name}`)
-          .set(result);
-      })
-      .then(() => null);
+    return Promise.all(running).then(results => {
+      let sum = 0;
+      results.forEach(val => (sum = sum + val.passed));
+      const summary = `passed ${sum} of ${running.length}`;
+      const passed = sum === running.length;
+      console.log(summary);
+      const result = { passed, summary, tests: results };
+      return firebase
+        .database()
+        .ref(`testRuns/${testId}/${this.name}`)
+        .set(result);
+    });
   }
 }
 

integration_test/package.node6.json

@@ -0,0 +1,23 @@
+{
+  "name": "functions",
+  "description": "Integration test for the Firebase SDK for Google Cloud Functions",
+  "scripts": {
+    "build": "./node_modules/.bin/tsc"
+  },
+  "dependencies": {
+    "@google-cloud/pubsub": "~0.19.0",
+    "@types/google-cloud__pubsub": "^0.18.0",
+    "@types/lodash": "~4.14.41",
+    "firebase-admin": "~5.13.0",
+    "firebase-functions": "./firebase-functions.tgz",
+    "lodash": "~4.17.2"
+  },
+  "main": "lib/index.js",
+  "devDependencies": {
+    "typescript": "~2.8.3"
+  },
+  "engines": {
+    "node": "6"
+  },
+  "private": true
+}

integration_test/functions/package.json renamed to integration_test/package.node8.json

@@ -8,8 +8,7 @@
     "@google-cloud/pubsub": "~0.19.0",
     "@types/google-cloud__pubsub": "^0.18.0",
     "@types/lodash": "~4.14.41",
-    "firebase": "~5.2.0",
-    "firebase-admin": "~5.12.1",
+    "firebase-admin": "~5.13.0",
     "firebase-functions": "./firebase-functions.tgz",
     "lodash": "~4.17.2"
   },

integration_test/run_tests.sh

@@ -29,23 +29,33 @@ function build_sdk {
   mv firebase-functions-*.tgz integration_test/functions/firebase-functions.tgz
 }
 
+function pick_node6 {
+  cd $DIR
+  cp package.node6.json functions/package.json
+}
+
+function pick_node8 {
+  cd $DIR
+  cp package.node8.json functions/package.json
+}
+
 function install_deps {
   announce "Installing dependencies..."
   cd $DIR/functions
+  rm -rf node_modules/firebase-functions
   npm install
 }
 
 function delete_all_functions {
-  announce "Deploying empty index.js to project..."
+  announce "Deleting all functions in project..."
   cd $DIR
-  ./functions/node_modules/.bin/tsc -p functions/ # Make sure the functions/lib directory actually exists.
-  echo "" > functions/lib/index.js
-  firebase deploy --project=$PROJECT_ID --only functions
+  # Try to delete, if there are errors it is because the project is already empty,
+  # in that case do nothing. 
+  firebase functions:delete callableTests createUserTests databaseTests deleteUserTests firestoreTests integrationTests pubsubTests --project=$PROJECT_ID -f || :
   announce "Project emptied."
 }
 
 function deploy {
-  announce "Deploying functions..."
   cd $DIR
   ./functions/node_modules/.bin/tsc -p functions/
   # Deploy functions, and security rules for database and Firestore
@@ -72,16 +82,20 @@ function cleanup {
   announce "Performing cleanup..."
   delete_all_functions
   rm $DIR/functions/firebase-functions.tgz
+  rm $DIR/functions/package.json
   rm -f $DIR/functions/firebase-debug.log
   rm -rf $DIR/functions/node_modules/firebase-functions
 }
 
 build_sdk
+pick_node8
 install_deps
 delete_all_functions
+announce "Deploying functions to Node 8 runtime ..."
 deploy
 run_tests
-announce "Re-deploying the same functions to make sure updates work..."
+pick_node6
+announce "Re-deploying the same functions to Node 6 runtime ..."
 deploy
 run_tests
 cleanup