chore: refactor nodejs-repo-tools and stubbing (GoogleCloudPlatform#1626)

* chore: refactor node-repo-tools

Author: sofisl

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

@@ -25,6 +25,8 @@
  "devDependencies": {
  "@google-cloud/nodejs-repo-tools": "^3.3.0",
  "mocha": "^7.0.0",
- "sinon": "^9.0.0"
+ "sinon": "^9.0.0",
+ "supertest": "^4.0.2",
+ "proxyquire": "^2.1.3"
  }
 }

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

@@ -15,26 +15,17 @@
 
 const path = require('path');
 const assert = require('assert');
-const utils = require('@google-cloud/nodejs-repo-tools');
 const sinon = require('sinon');
+const supertest = require('supertest');
+const proxyquire = require('proxyquire').noPreserveCache();
 
 const cwd = path.join(__dirname, '../');
-const requestObj = utils.getRequest({
- cwd: cwd,
- cmd: 'server',
-});
+
+const requestObj = supertest(proxyquire(path.join(cwd, 'server'), {process}));
 
 const stubConsole = function() {
  sinon.stub(console, `error`);
- sinon.stub(console, `log`).callsFake((a, b) => {
- if (
- typeof a === `string` &&
- a.indexOf(`\u001b`) !== -1 &&
- typeof b === `string`
- ) {
- console.log.apply(console, arguments);
- }
- });
+ sinon.stub(console, `log`);
 };
 
 const restoreConsole = function() {

appengine/cloudsql/test/createTables.test.js

@@ -59,15 +59,7 @@ const getSample = () => {
 const stubConsole = function() {
  /* eslint-disable no-console */
  sinon.stub(console, `error`);
- sinon.stub(console, `log`).callsFake((a, b) => {
- if (
- typeof a === `string` &&
- a.indexOf(`\u001b`) !== -1 &&
- typeof b === `string`
- ) {
- console.log.apply(console, arguments);
- }
- });
+ sinon.stub(console, `log`);
 };
 
 const restoreConsole = function() {

appengine/cloudsql_postgresql/test/createTables.test.js

@@ -58,15 +58,7 @@ const getSample = () => {
 
 const stubConsole = function() {
  sinon.stub(console, `error`);
- sinon.stub(console, `log`).callsFake((a, b) => {
- if (
- typeof a === `string` &&
- a.indexOf(`\u001b`) !== -1 &&
- typeof b === `string`
- ) {
- console.log.apply(console, arguments);
- }
- });
+ sinon.stub(console, `log`);
 };
 
 const restoreConsole = function() {

appengine/pubsub/package.json

@@ -24,7 +24,9 @@
  "jsonwebtoken": "^8.5.1",
  "mocha": "^7.0.0",
  "sinon": "^9.0.0",
- "uuid": "^7.0.0"
+ "uuid": "^7.0.0",
+ "supertest": "^4.0.2",
+ "proxyquire": "^2.1.3"
  },
  "cloud-repo-tools": {
  "requiresProjectId": true,

appengine/pubsub/test/app.test.js

@@ -24,13 +24,14 @@ const jwt = require('jsonwebtoken');
 const {OAuth2Client} = require('google-auth-library');
 const path = require('path');
 const sinon = require('sinon');
-const utils = require('@google-cloud/nodejs-repo-tools');
+const supertest = require('supertest');
+const proxyquire = require('proxyquire').noPreserveCache();
 
 const message = 'This is a test message sent at: ';
 const payload = message + Date.now();
 
 const cwd = path.join(__dirname, '../');
-const requestObj = utils.getRequest({cwd: cwd});
+const requestObj = supertest(proxyquire(path.join(cwd, 'app'), {process}));
 
 const fixtures = path.join(__dirname, 'fixtures');
 const privateKey = fs.readFileSync(path.join(fixtures, 'privatekey.pem'));

appengine/sendgrid/package.json

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

appengine/sendgrid/test/app.test.js

@@ -1,9 +1,10 @@
 const assert = require('assert');
 const path = require('path');
-const utils = require('@google-cloud/nodejs-repo-tools');
+const supertest = require('supertest');
+const proxyquire = require('proxyquire').noPreserveCache();
 
 const cwd = path.join(__dirname, '../');
-const request = utils.getRequest({cwd: cwd});
+const request = supertest(proxyquire(path.join(cwd, 'app'), {process}));
 
 describe('gae_flex_sendgrid', () => {
  it('GET /: should show homepage template', async () => {

appengine/storage/flexible/package.json

@@ -17,7 +17,9 @@
  },
  "devDependencies": {
  "@google-cloud/nodejs-repo-tools": "^3.3.0",
- "mocha": "^7.0.0"
+ "mocha": "^7.0.0",
+ "supertest": "^4.0.2",
+ "proxyquire": "^2.1.3"
  },
  "cloud-repo-tools": {
  "requiresProjectId": true,

appengine/storage/flexible/system-test/app.test.js

@@ -17,13 +17,14 @@ const path = require('path');
 const {Storage} = require('@google-cloud/storage');
 const storage = new Storage();
 const assert = require('assert');
-const tools = require('@google-cloud/nodejs-repo-tools');
+const supertest = require('supertest');
+const proxyquire = require('proxyquire').noPreserveCache();
 
 const bucketName = process.env.GCLOUD_STORAGE_BUCKET;
 const bucket = storage.bucket(bucketName);
 
 const cwd = path.join(__dirname, '../');
-const requestObj = tools.getRequest({cwd: cwd});
+const requestObj = supertest(proxyquire(path.join(cwd, 'app'), {process}));
 
 before(async () => {
  assert(