chore: refactor repo tools usage

appengine/analytics/app.js

@@ -72,4 +72,6 @@ app.listen(PORT, () => {
   console.log(`App listening on port ${PORT}`);
   console.log('Press Ctrl+C to quit.');
 });
+
+module.exports = app;
 // [END gae_flex_analytics_track_event]

appengine/analytics/package.json

@@ -14,15 +14,16 @@
   },
   "scripts": {
     "start": "node app.js",
-    "system-test": "repo-tools test app",
+    "system-test": "mocha --exit test/*.test.js",
     "test": "npm run system-test"
   },
   "dependencies": {
     "express": "^4.16.4",
     "got": "^10.0.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+    "mocha": "^7.0.0",
+    "supertest": "^4.0.2"
   },
   "cloud-repo-tools": {
     "test": {

appengine/analytics/test/app.test.js

@@ -0,0 +1,7 @@
+const supertest = require('supertest');
+const path = require('path');
+const app = require(path.join(__dirname, '../', 'app.js'));
+
+it('should be listening', async () => {
+  await supertest(app).get('/').expect(200);
+});

appengine/building-an-app/build/package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "start": "node server.js",
     "deploy": "gcloud app deploy",
-    "test": "repo-tools test app -- server.js"
+    "test": "mocha --exit test/*.test.js"
   },
   "repository": {
     "type": "git",
@@ -22,7 +22,9 @@
     "express": "^4.16.3"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+    "mocha": "^7.0.0",
+    "supertest": "^4.0.2",
+    "proxyquire": "^2.1.3"
   },
   "cloud-repo-tools": {
     "requiresKeyFile": false,

appengine/building-an-app/build/test/server.test.js

@@ -0,0 +1,7 @@
+const supertest = require('supertest');
+const path = require('path');
+const app = require(path.join(__dirname, '../', 'server.js'));
+
+it('should be listening', async () => {
+  await supertest(app).get('/').expect(200);
+});

appengine/building-an-app/update/package.json

@@ -23,7 +23,6 @@
     "express": "^4.16.3"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "mocha": "^7.0.0",
     "sinon": "^9.0.0",
     "supertest": "^4.0.2",

appengine/cloudsql/package.json

@@ -13,12 +13,12 @@
     "node": ">=8.0.0"
   },
   "scripts": {
-    "unit-test": "mocha test/*.test.js --timeout=60000",
+    "unit-test": "mocha --exit test/createTables.test.js; mocha --exit 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 --exit test/serverListening.test.js",
     "system-test-proxy": "npm run start-proxy; npm run system-test",
     "all-test": "npm run unit-test && npm run system-test",
-    "test": "repo-tools test run --cmd npm -- run all-test"
+    "test": "npm -- run all-test"
   },
   "dependencies": {
     "express": "^4.16.4",

appengine/cloudsql/test/serverListening.test.js

@@ -0,0 +1,11 @@
+const app = require('../server');
+
+const request = require('supertest');
+
+describe('start app', () => {
+  describe('GET /', () => {
+    it('should get 200', (done) => {
+      request(app).get('/').expect(200, done);
+    });
+  });
+});

appengine/cloudsql_postgresql/package.json

@@ -15,10 +15,10 @@
   "scripts": {
     "unit-test": "mocha test/*.test.js --timeout=30000",
     "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 --exit test/*.test.js",
     "system-test-proxy": "npm run start-proxy; npm run system-test",
     "all-test": "npm run unit-test && npm run system-test",
-    "test": "repo-tools test run --cmd npm -- run all-test"
+    "test": "npm -- run all-test"
   },
   "dependencies": {
     "express": "^4.16.4",
@@ -27,7 +27,6 @@
     "prompt": "^1.0.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "mocha": "^7.0.0",
     "proxyquire": "^2.1.0",
     "sinon": "^9.0.0",

appengine/cloudsql_postgresql/test/serverListening.test.js

@@ -0,0 +1,11 @@
+const app = require('../server');
+
+const request = require('supertest');
+
+describe('start app', () => {
+  describe('GET /', () => {
+    it('should get 200', (done) => {
+      request(app).get('/').expect(200, done);
+    });
+  });
+});

appengine/datastore/package.json

@@ -14,15 +14,16 @@
   },
   "scripts": {
     "start": "node app.js",
-    "system-test": "repo-tools test app",
+    "system-test": "mocha --exit test/*.test.js",
     "test": "npm run system-test"
   },
   "dependencies": {
     "@google-cloud/datastore": "^5.0.0",
     "express": "^4.16.4"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+    "mocha": "^7.0.0",
+    "supertest": "^4.0.2"
   },
   "cloud-repo-tools": {
     "test": {

appengine/datastore/test/app.test.js

@@ -0,0 +1,7 @@
+const supertest = require('supertest');
+const path = require('path');
+const app = require(path.join(__dirname, '../', 'app.js'));
+
+it('should be listening', async () => {
+  await supertest(app).get('/').expect(200);
+});

appengine/endpoints/package.json

@@ -15,18 +15,16 @@
   "scripts": {
     "deploy": "gcloud app deploy",
     "start": "node app.js",
-    "unit-test": "mocha test/ --timeout=60000 --exit",
-    "system-test": "repo-tools test app",
+    "unit-test": "mocha test/app.test.js --timeout=60000 --exit",
+    "system-test": "mocha --exit test/appListening.test.js",
     "all-test": "npm run unit-test && npm run system-test",
-    "test": "repo-tools test run --cmd npm -- run all-test",
-    "e2e-test": "repo-tools test deploy"
+    "test": "npm -- run all-test"
   },
   "dependencies": {
     "body-parser": "^1.18.3",
     "express": "^4.16.4"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "mocha": "^7.0.0",
     "proxyquire": "^2.1.0",
     "sinon": "^9.0.0",

appengine/endpoints/test/appListening.test.js

@@ -0,0 +1,11 @@
+const app = require('../app.js');
+
+const request = require('supertest');
+
+describe('start app', () => {
+  describe('GET /', () => {
+    it('should get 200', (done) => {
+      request(app).get('/').expect(200, done);
+    });
+  });
+});

appengine/mailjet/app.js

@@ -79,3 +79,5 @@ const server = app.listen(process.env.PORT || 8080, () => {
   console.log('App listening on port %s', server.address().port);
   console.log('Press Ctrl+C to quit.');
 });
+
+module.exports = app;

appengine/mailjet/package.json

@@ -14,7 +14,7 @@
   },
   "scripts": {
     "start": "node app.js",
-    "system-test": "repo-tools test app",
+    "system-test": "mocha --exit test/*.test.js",
     "test": "npm run system-test"
   },
   "dependencies": {
@@ -24,7 +24,8 @@
     "node-mailjet": "^3.3.1"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+    "mocha": "^7.0.0",
+    "supertest": "^4.0.2"
   },
   "cloud-repo-tools": {
     "test": {

appengine/mailjet/test/app.test.js

@@ -0,0 +1,11 @@
+const app = require('../app');
+
+const request = require('supertest');
+
+describe('start app', () => {
+  describe('GET /', () => {
+    it('should get 200', (done) => {
+      request(app).get('/').expect(200, done);
+    });
+  });
+});

appengine/memcached/app.js

@@ -47,3 +47,5 @@ app.listen(PORT, () => {
   console.log(`App listening on port ${PORT}`);
   console.log('Press Ctrl+C to quit.');
 });
+
+module.exports = app;

appengine/memcached/package.json

@@ -10,13 +10,14 @@
   },
   "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"
+    "mocha": "^7.0.0",
+    "supertest": "^4.0.2"
   }
 }

appengine/memcached/test/app.test.js

@@ -0,0 +1,11 @@
+const app = require('../app');
+
+const request = require('supertest');
+
+describe('start app', () => {
+  describe('GET /', () => {
+    it('should get 200', (done) => {
+      request(app).get('/').expect(200, done);
+    });
+  });
+});

appengine/metadata/flexible/package.json

@@ -13,15 +13,16 @@
     "node": ">=8.0.0"
   },
   "scripts": {
-    "system-test": "repo-tools test app -- server.js",
+    "system-test": "mocha --exit test/*.test.js",
     "test": "npm run system-test"
   },
   "dependencies": {
     "express": "^4.16.4",
     "got": "^10.0.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+    "mocha": "^7.0.0",
+    "supertest": "^4.0.2"
   },
   "cloud-repo-tools": {
     "test": {

appengine/metadata/flexible/test/server.test.js

@@ -0,0 +1,7 @@
+const supertest = require('supertest');
+const path = require('path');
+const app = require(path.join(__dirname, '../', 'server.js'));
+
+it('should be listening', async () => {
+  await supertest(app).get('/').expect(200);
+});

appengine/metadata/standard/package.json

@@ -13,15 +13,16 @@
     "node": ">=8.0.0"
   },
   "scripts": {
-    "system-test": "repo-tools test app -- ./server.js",
+    "system-test": "mocha --exit test/*.test.js",
     "test": "npm run system-test"
   },
   "dependencies": {
     "express": "^4.16.4",
     "got": "^10.0.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+    "mocha": "^7.0.0",
+    "supertest": "^4.0.2"
   },
   "cloud-repo-tools": {
     "test": {

appengine/metadata/standard/test/server.test.js

@@ -0,0 +1,7 @@
+const supertest = require('supertest');
+const path = require('path');
+const app = require(path.join(__dirname, '../', 'server.js'));
+
+it('should be listening', async () => {
+  await supertest(app).get('/').expect(200);
+});

appengine/pubsub/package.json

@@ -10,7 +10,7 @@
   },
   "scripts": {
     "start": "node app.js",
-    "test": "repo-tools test app && mocha */*.test.js --timeout=30000 --exit"
+    "test": "repo-tools test app && mocha test/app.test.js --timeout=30000 --exit"
   },
   "dependencies": {
     "@google-cloud/pubsub": "^1.0.0",

appengine/pubsub/test/appListening.test.js

@@ -0,0 +1,11 @@
+const app = require('../app');
+
+const request = require('supertest');
+
+describe('start app', () => {
+  describe('GET /', () => {
+    it('should get 200', (done) => {
+      request(app).get('/').expect(200, done);
+    });
+  });
+});

appengine/redis/package.json

@@ -10,7 +10,7 @@
   },
   "scripts": {
     "start": "node server.js",
-    "test": "repo-tools test app -- server.js"
+    "test": "mocha test/*.test.js --timeout=30000 --exit"
   },
   "cloud-repo-tools": {
     "test": {
@@ -32,6 +32,7 @@
     "redis": "^3.0.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+    "mocha": "^7.0.0",
+    "supertest": "^4.0.2"
   }
 }

appengine/redis/test/server.test.js

@@ -0,0 +1,11 @@
+const supertest = require('supertest');
+const path = require('path');
+const app = require(path.join(__dirname, '../', 'server.js'));
+
+after(() => {
+  process.exitCode(0);
+});
+
+it('should be listening', async () => {
+  await supertest(app).get('/').expect(200);
+});

appengine/sendgrid/package.json

@@ -10,7 +10,7 @@
   },
   "scripts": {
     "start": "node app.js",
-    "test": "repo-tools test app && mocha test/*.test.js"
+    "test": "mocha test/*.test.js"
   },
   "dependencies": {
     "body-parser": "^1.19.0",
@@ -19,7 +19,6 @@
     "@sendgrid/client": "^6.3.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "mocha": "^7.0.0",
     "supertest": "^4.0.2",
     "proxyquire": "^2.1.3"

appengine/sendgrid/test/appListening.test.js

@@ -0,0 +1,7 @@
+const supertest = require('supertest');
+const path = require('path');
+const app = require(path.join(__dirname, '../', 'app.js'));
+
+it('should be listening', async () => {
+  await supertest(app).get('/').expect(200);
+});