GoogleCloudPlatform · sofisl · Apr 1, 2020 · Apr 1, 2020 · Apr 10, 2020 · Apr 10, 2020
diff --git a/appengine/cloudsql/test/createTables.test.js b/appengine/cloudsql/test/createTables.test.js
@@ -57,7 +57,6 @@ const getSample = () => {
 };
 
 const stubConsole = function () {
-  /* eslint-disable no-console */
   sinon.stub(console, `error`);
   sinon.stub(console, `log`);
 };

diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json
@@ -13,9 +13,9 @@
     "node": ">=8.0.0"
   },
   "scripts": {
-    "unit-test": "mocha test/*.test.js --timeout=30000",
+    "unit-test": "mocha test/createTables.test.js --timeout=30000 && mocha test/server.test.js",
     "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &",
-    "system-test": "repo-tools test app -- server.js",
+    "system-test": "mocha test/serverListening.test.js --exit",
     "system-test-proxy": "npm run start-proxy; npm run system-test",
     "all-test": "npm run unit-test && npm run system-test",
     "test": "npm -- run all-test"
@@ -27,8 +27,9 @@
     "prompt": "^1.0.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "mocha": "^7.0.0",
+    "wait-port": "^0.2.7",
+    "chai": "^4.2.0",
     "proxyquire": "^2.1.0",
     "sinon": "^9.0.0",
     "supertest": "^4.0.0"

diff --git a/appengine/cloudsql_postgresql/server.js b/appengine/cloudsql_postgresql/server.js
@@ -69,7 +69,6 @@ const insertVisit = (knex, visit) => {
  * @param {object} knex The Knex connection object.
  * @returns {Promise}
  */
-
 const getVisits = async (knex) => {
   const results = await knex
     .select('timestamp', 'userIp')
@@ -99,7 +98,6 @@ app.get('/', async (req, res, next) => {
 
     // Query the last 10 visits from the database.
     const visits = await getVisits(knex);
-
     res
       .status(200)
       .set('Content-Type', 'text/plain')

diff --git a/appengine/cloudsql_postgresql/test/createTables.test.js b/appengine/cloudsql_postgresql/test/createTables.test.js
@@ -132,7 +132,6 @@ describe('gae_flex_postgres_create_tables', () => {
       knex: sample.mocks.Knex,
       prompt: sample.mocks.prompt,
     });
-
     await new Promise((r) => setTimeout(r, 10));
     assert.ok(console.error.calledOnce);
     assert.ok(

diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js
@@ -0,0 +1,15 @@
+const waitPort = require('wait-port');
+const {expect} = require('chai');
+const PORT = process.env.PORT || 8080;
+const childProcess = require('child_process');
+const path = require('path');
+const appPath = path.join(__dirname, '../server.js');
+
+describe('server listening', () => {
+  it('should be listening', async () => {
+    const child = childProcess.exec(`node ${appPath}`);
+    const isOpen = await waitPort({port: PORT});
+    expect(isOpen).to.be.true;
+    process.kill(child.pid, 'SIGTERM');
+  });
+});
diff --git a/appengine/memcached/app.js b/appengine/memcached/app.js
@@ -43,7 +43,9 @@ app.get('/', async (req, res, next) => {
 });
 
 const PORT = process.env.PORT || 8080;
-app.listen(PORT, () => {
+const server = app.listen(PORT, () => {
   console.log(`App listening on port ${PORT}`);
   console.log('Press Ctrl+C to quit.');
 });
+
+module.exports = server;
diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json
@@ -10,13 +10,15 @@
   },
   "scripts": {
     "start": "node app.js",
-    "test": "repo-tools test app"
+    "test": "mocha --exit test/*.test.js"
   },
   "dependencies": {
     "express": "^4.16.4",
     "memjs": "^1.2.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+    "chai": "^4.2.0",
+    "mocha": "^7.1.1",
+    "wait-port": "^0.2.7"
   }
 }
diff --git a/appengine/memcached/test/app.test.js b/appengine/memcached/test/app.test.js
@@ -0,0 +1,13 @@
+const waitPort = require('wait-port');
+const {expect} = require('chai');
+
+const PORT = process.env.PORT || 8080;
+
+describe('server listening', () => {
+  it('should be listening', async () => {
+    const server = require('../app.js');
+    const isOpen = await waitPort({port: PORT});
+    expect(isOpen).to.be.true;
+    server.close();
+  });
+});
diff --git a/appengine/websockets/package.json b/appengine/websockets/package.json
@@ -28,7 +28,7 @@
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.0.0",
     "mocha": "^7.0.0",
-    "puppeteer": "^2.0.0"
+    "puppeteer": "^3.0.0"
   },
   "cloud-repo-tools": {
     "test": {

diff --git a/healthcare/hl7v2/createHl7v2Message.js b/healthcare/hl7v2/createHl7v2Message.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_create_hl7v2_message]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
   const fs = require('fs');
   const util = require('util');
   const readFile = util.promisify(fs.readFile);

diff --git a/healthcare/hl7v2/createHl7v2Store.js b/healthcare/hl7v2/createHl7v2Store.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_create_hl7v2_store]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const createHl7v2Store = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/deleteHl7v2Message.js b/healthcare/hl7v2/deleteHl7v2Message.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_delete_hl7v2_message]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const deleteHl7v2Message = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/deleteHl7v2Store.js b/healthcare/hl7v2/deleteHl7v2Store.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_delete_hl7v2_store]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const deleteHl7v2Store = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/getHl7v2Message.js b/healthcare/hl7v2/getHl7v2Message.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_get_hl7v2_message]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const getHl7v2Message = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/getHl7v2Store.js b/healthcare/hl7v2/getHl7v2Store.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_get_hl7v2_store]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const getHl7v2Store = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/getHl7v2StoreIamPolicy.js b/healthcare/hl7v2/getHl7v2StoreIamPolicy.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_hl7v2_store_get_iam_policy]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const getHl7v2StoreIamPolicy = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/ingestHl7v2Message.js b/healthcare/hl7v2/ingestHl7v2Message.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_ingest_hl7v2_message]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
   const fs = require('fs');
   const util = require('util');
   const readFile = util.promisify(fs.readFile);

diff --git a/healthcare/hl7v2/listHl7v2Messages.js b/healthcare/hl7v2/listHl7v2Messages.js
@@ -24,7 +24,7 @@ const main = (
 ) => {
   // [START healthcare_list_hl7v2_messages]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const listHl7v2Messages = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/listHl7v2Stores.js b/healthcare/hl7v2/listHl7v2Stores.js
@@ -23,7 +23,7 @@ const main = (
 ) => {
   // [START healthcare_list_hl7v2_stores]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const listHl7v2Stores = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/package.json b/healthcare/hl7v2/package.json
@@ -16,7 +16,7 @@
     "mocha": "^7.0.0"
   },
   "dependencies": {
-    "googleapis": "^48.0.0",
+    "googleapis": "^49.0.0",
     "uuid": "^7.0.0",
     "yargs": "^15.0.0"
   },

diff --git a/healthcare/hl7v2/patchHl7v2Message.js b/healthcare/hl7v2/patchHl7v2Message.js
@@ -27,7 +27,7 @@ const main = (
 ) => {
   // [START healthcare_patch_hl7v2_message]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const patchHl7v2Message = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/patchHl7v2Store.js b/healthcare/hl7v2/patchHl7v2Store.js
@@ -25,7 +25,7 @@ const main = (
 ) => {
   // [START healthcare_patch_hl7v2_store]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const patchHl7v2Store = async () => {
     const auth = await google.auth.getClient({

diff --git a/healthcare/hl7v2/setHl7v2StoreIamPolicy.js b/healthcare/hl7v2/setHl7v2StoreIamPolicy.js
@@ -26,7 +26,7 @@ const main = (
 ) => {
   // [START healthcare_hl7v2_store_set_iam_policy]
   const {google} = require('googleapis');
-  const healthcare = google.healthcare('v1beta1');
+  const healthcare = google.healthcare('v1');
 
   const setHl7v2StoreIamPolicy = async () => {
     const auth = await google.auth.getClient({