chore: refactor repo tools usage (#1639)

* chore: refactor repo tools usage by adding tests

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

@@ -18,7 +18,7 @@
     "system-test": "repo-tools test app -- server.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_postgresql/package.json

@@ -18,7 +18,7 @@
     "system-test": "repo-tools test app -- server.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/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

@@ -18,8 +18,7 @@
     "unit-test": "mocha test/ --timeout=60000 --exit",
     "system-test": "repo-tools test app",
     "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": "repo-tools test run --cmd npm -- run all-test"  
   },
   "dependencies": {
     "body-parser": "^1.18.3",

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/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/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);
+});

appengine/static-files/app.js

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

appengine/static-files/package.json

@@ -10,7 +10,7 @@
   },
   "scripts": {
     "start": "node app.js",
-    "test": "repo-tools test app --url localhost:8080/static/main.css"
+    "test": "mocha --exit test/*.test.js --url localhost:8080/static/main.css"
   },
   "cloud-repo-tools": {
     "test": {
@@ -25,6 +25,7 @@
     "pug": "^2.0.3"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+    "mocha": "^7.0.0",
+    "supertest": "^4.0.2"
   }
 }

appengine/static-files/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/storage/flexible/package.json

@@ -16,7 +16,6 @@
     "pug": "^2.0.3"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "mocha": "^7.0.0",
     "supertest": "^4.0.2",
     "proxyquire": "^2.1.3"

appengine/storage/standard/package.json

@@ -16,7 +16,6 @@
     "pug": "^2.0.3"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "mocha": "^7.0.0",
     "supertest": "^4.0.2",
     "proxyquire": "^2.1.3"

appengine/typescript/index.ts

@@ -11,10 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+import express = require('express');
 
 const PORT = Number(process.env.PORT) || 8080;
-import * as express from "express";
-
 const app = express();
 
 app.get("/", (req, res) => {

appengine/typescript/package.json

@@ -11,7 +11,7 @@
   "scripts": {
     "prepare": "npm run gcp-build",
     "pretest": "npm run gcp-build",
-    "test": "repo-tools test app -- index.js",
+    "test": "repo-tools test app -- index.js",    
     "posttest": "npm run lint",
     "lint": "tslint -p .",
     "start": "node ./index.js",

appengine/websockets/package.json

@@ -13,16 +13,16 @@
     "start": "node app.js",
     "lint": "eslint .",
     "fix": "eslint --fix .",
-    "test": "repo-tools test app & mocha */*.test.js --timeout=30000 --exit",
+    "test": "mocha --exit test/*.test.js",
     "e2e-test": "samples test deploy"
   },
   "dependencies": {
     "express": "^4.15.4",
     "pug": "^2.0.3",
-    "socket.io": "^2.2.0"
+    "socket.io": "^2.2.0",
+    "supertest": "^4.0.2"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "eslint": "^6.0.0",
     "eslint-config-prettier": "^6.0.0",
     "eslint-plugin-node": "^11.0.0",

appengine/websockets/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);
+});

auth/package.json

@@ -12,15 +12,14 @@
     "node": ">=8.0.0"
   },
   "scripts": {
-    "test": "repo-tools test run --cmd=npm -- run system-test",
+    "test": "npm -- run system-test",
     "system-test": "mocha system-test/*.test.js --timeout=30000"
   },
   "dependencies": {
     "@google-cloud/storage": "^4.0.0",
     "yargs": "^15.0.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "mocha": "^7.0.0"
   }
 }