Remove emulator + shims from testing samples

functions/helloworld/index.js

@@ -81,42 +81,37 @@ exports.helloBackground = (event, callback) => {
  * This function is exported by index.js, and executed when
  * the trigger topic receives a message.
  *
- * @param {object} event The Cloud Functions event.
- * @param {function} callback The callback function.
+ * @param {object} data The event payload.
+ * @param {object} context The event metadata.
  */
-exports.helloPubSub = (event, callback) => {
-  const pubsubMessage = event.data;
-  const name = pubsubMessage.data
-    ? Buffer.from(pubsubMessage.data, 'base64').toString()
+exports.helloPubSub = (data, context) => {
+  const pubSubMessage = data;
+  const name = pubSubMessage.data
+    ? Buffer.from(pubSubMessage.data, 'base64').toString()
     : 'World';
 
   console.log(`Hello, ${name}!`);
-
-  callback();
 };
 // [END functions_helloworld_pubsub]
 
 // [START functions_helloworld_storage]
 /**
  * Background Cloud Function to be triggered by Cloud Storage.
  *
- * @param {object} event The Cloud Functions event.
- * @param {function} callback The callback function.
+ * @param {object} data The event payload.
+ * @param {object} context The event metadata.
  */
-exports.helloGCS = (event, callback) => {
-  const file = event.data;
-
+exports.helloGCS = (data, context) => {
+  const file = data;
   if (file.resourceState === 'not_exists') {
     console.log(`File ${file.name} deleted.`);
   } else if (file.metageneration === '1') {
     // metageneration attribute is updated on metadata changes.
-    // value is 1 if file was newly created or overwritten
+    // on create value is 1
     console.log(`File ${file.name} uploaded.`);
   } else {
     console.log(`File ${file.name} metadata updated.`);
   }
-
-  callback();
 };
 // [END functions_helloworld_storage]
 

functions/helloworld/package.json

@@ -13,7 +13,7 @@
   },
   "scripts": {
     "e2e-test": "export FUNCTIONS_CMD='gcloud functions' && sh test/updateFunctions.sh && BASE_URL=\"https://$GCP_REGION-$GCLOUD_PROJECT.cloudfunctions.net/\" mocha test/*.test.js --timeout=60000 --exit",
-    "test": "export FUNCTIONS_CMD='functions-emulator' && sh test/updateFunctions.sh && export BASE_URL=\"http://localhost:8010/$GCLOUD_PROJECT/$GCF_REGION\" && mocha test/*.test.js --timeout=60000 --exit",
+    "test": "export BASE_URL=\"http://localhost:8010/$GCLOUD_PROJECT/$GCF_REGION\" && mocha test/*.test.js --timeout=60000 --exit",
     "system-test": "export FUNCTIONS_CMD='functions-emulator' && sh test/updateFunctions.sh && export BASE_URL=\"http://localhost:8010/$GCLOUD_PROJECT/$GCF_REGION\" && mocha test/*.test.js --timeout=60000 --exit"
   },
   "dependencies": {
@@ -26,8 +26,10 @@
     "@google-cloud/nodejs-repo-tools": "^3.0.0",
     "@google-cloud/pubsub": "^0.28.0",
     "@google-cloud/storage": "^2.0.0",
-    "mocha": "^6.0.0",
+    "child-process-promise": "^2.2.1",
+    "delay": "^4.2.0",
     "express": "^4.16.3",
+    "mocha": "^6.1.4",
     "proxyquire": "^2.1.0",
     "sinon": "^7.0.0",
     "supertest": "^4.0.0",

functions/helloworld/test/sample.integration.http.test.js

@@ -15,25 +15,51 @@
 
 // [START functions_http_integration_test]
 const assert = require('assert');
-const Supertest = require('supertest');
-const supertest = Supertest(process.env.BASE_URL);
+const delay = require('delay');
+const execPromise = require('child-process-promise').exec;
+const path = require('path');
+const supertest = require('supertest');
+const uuid = require('uuid');
+
+const request = supertest(process.env.BASE_URL || 'http://localhost:8080');
+const cwd = path.join(__dirname, '..');
+
+let ffProc;
+
+// Run the functions-framework instance to host functions locally
+before(async () => {
+  ffProc = execPromise(
+    `functions-framework --target=helloHttp --signature-type=http`,
+    {timeout: 1000, shell: true, cwd}
+  );
+
+  // Wait for functions-framework to start up
+  await delay(600);
+});
+
+after.always(async () => {
+  await ffProc;
+});
 
 it('helloHttp: should print a name', async () => {
-  await supertest
+  const name = uuid.v4();
+
+  await request
     .post('/helloHttp')
-    .send({name: 'John'})
+    .send({name})
     .expect(200)
     .expect(response => {
-      assert.strictEqual(response.text, 'Hello John!');
+      assert.strictEqual(response.text, `Hello ${name}!`);
     });
 });
 
+// [END functions_http_integration_test]
+
 it('helloHttp: should print hello world', async () => {
-  await supertest
+  await request
     .get('/helloHttp')
     .expect(200)
     .expect(response => {
       assert.strictEqual(response.text, 'Hello World!');
     });
 });
-// [END functions_http_integration_test]

functions/helloworld/test/sample.integration.pubsub.test.js

@@ -14,38 +14,60 @@
  */
 
 // [START functions_pubsub_integration_test]
-const childProcess = require('child_process');
 const assert = require('assert');
+const execPromise = require('child-process-promise').exec;
+const delay = require('delay');
+const path = require('path');
+const supertest = require('supertest');
 const uuid = require('uuid');
 
-it('helloPubSub: should print a name', done => {
-  const startTime = new Date(Date.now()).toISOString();
+const request = supertest(process.env.BASE_URL || 'http://localhost:8080');
+const cwd = path.join(__dirname, '..');
+
+it('helloPubSub: should print a name', async () => {
   const name = uuid.v4();
 
-  // Mock Pub/Sub call, as the emulator doesn't listen to Pub/Sub topics
   const encodedName = Buffer.from(name).toString('base64');
-  const data = JSON.stringify({data: encodedName});
-  childProcess.execSync(`functions call helloPubSub --data ${data}`);
-
-  // Check the emulator's logs
-  const logs = childProcess
-    .execSync(`functions logs read helloPubSub --start-time ${startTime}`)
-    .toString();
-  assert.strictEqual(logs.includes(`Hello, ${name}!`), true);
-  done();
-});
+  const pubsubMessage = {data: {data: encodedName}};
+
+  const proc = execPromise(
+    `functions-framework --target=helloPubSub --signature-type=event`,
+    {timeout: 800, shell: true, cwd}
+  );
 
-it('helloPubSub: should print hello world', done => {
-  const startTime = new Date(Date.now()).toISOString();
+  // Wait for functions-framework to start up
+  await delay(600);
 
-  // Mock Pub/Sub call, as the emulator doesn't listen to Pub/Sub topics
-  childProcess.execSync('functions call helloPubSub --data {}');
+  // Send HTTP request simulating Pub/Sub message
+  // (GCF translates Pub/Sub messages to HTTP requests internally)
+  await request
+    .post('/')
+    .send(pubsubMessage)
+    .expect(204);
 
-  // Check the emulator's logs
-  const logs = childProcess
-    .execSync(`functions logs read helloPubSub --start-time ${startTime}`)
-    .toString();
-  assert.strictEqual(logs.includes('Hello, World!'), true);
-  done();
+  const {stdout} = await proc;
+  assert(stdout.includes(`Hello, ${name}!`));
 });
 // [END functions_pubsub_integration_test]
+
+it('helloPubSub: should print hello world', async () => {
+  const pubsubMessage = {};
+
+  const proc = execPromise(
+    `functions-framework --target=helloPubSub --signature-type=event`,
+    {timeout: 800, shell: true, cwd}
+  );
+
+  // Wait for functions-framework to start up
+  await delay(600);
+
+  // Send HTTP request simulating Pub/Sub message
+  // (GCF translates Pub/Sub messages to HTTP requests internally)
+  await request
+    .post('/')
+    .send({data: pubsubMessage})
+    .expect(204);
+
+  const {stdout} = await proc;
+  assert(stdout.includes('Hello, World!'));
+});