refactor: use execSync for tests

package.json

@@ -94,6 +94,7 @@
     "@types/uuid": "^3.4.4",
     "assert-rejects": "^1.0.0",
     "bignumber.js": "^8.0.0",
+    "chai": "^4.2.0",
     "codecov": "^3.0.4",
     "eslint": "^5.4.0",
     "eslint-config-prettier": "^4.0.0",

samples/package.json

@@ -8,10 +8,10 @@
     "*.js"
   ],
   "engines": {
-    "node": ">=8"
+    "node": ">=10"
   },
   "scripts": {
-    "test": "mocha system-test --timeout 60000"
+    "test": "mocha --timeout 60000"
   },
   "dependencies": {
     "@google-cloud/logging": "^4.5.1",
@@ -21,9 +21,7 @@
     "yargs": "^13.0.0"
   },
   "devDependencies": {
-    "assert-rejects": "^1.0.0",
     "chai": "^4.2.0",
-    "execa": "^1.0.0",
     "mocha": "^6.0.0",
     "proxyquire": "^2.1.0",
     "supertest": "^4.0.0",

samples/system-test/logs.test.js → samples/test/logs.test.js

@@ -16,24 +16,24 @@
 'use strict';
 
 const {assert} = require('chai');
-const execa = require('execa');
+const cp = require('child_process');
 const uuid = require('uuid');
 
+const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 const cmd = 'node logs';
-const exec = async cmd => (await execa.shell(cmd)).stdout;
 const logName = `nodejs-logging-logs-test-${uuid.v4()}`;
 const message = 'Hello world!';
 
 describe('logs', () => {
-  it('should write a log entry', async () => {
-    const output = await exec(
+  it('should write a log entry', () => {
+    const output = execSync(
       `${cmd} write ${logName} '{"type":"global"}' '{"message":"${message}"}'`
     );
-    assert.strictEqual(output, `Wrote to ${logName}`);
+    assert.include(output, `Wrote to ${logName}`);
   });
 
-  it('should write a simple log entry', async () => {
-    const output = await exec(`${cmd} write-simple ${logName}`);
-    assert.strictEqual(output, `Wrote to ${logName}`);
+  it('should write a simple log entry', () => {
+    const output = execSync(`${cmd} write-simple ${logName}`);
+    assert.include(output, `Wrote to ${logName}`);
   });
 });

samples/system-test/quickstart.test.js → samples/test/quickstart.test.js

@@ -18,7 +18,9 @@
 const {assert} = require('chai');
 const uuid = require('uuid');
 const {Logging} = require('@google-cloud/logging');
-const execa = require('execa');
+const cp = require('child_process');
+
+const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 
 const logging = new Logging();
 const logName = `nodejs-docs-samples-test-${uuid.v4()}`;
@@ -33,8 +35,8 @@ describe('quickstart', () => {
       .catch(console.warn);
   });
 
-  it('should log an entry', async () => {
-    const {stdout} = await execa.shell(`${cmd} ${projectId} ${logName}`);
-    assert.match(stdout, /Logged: Hello, world!/);
+  it('should log an entry', () => {
+    const stdout = execSync(`${cmd} ${projectId} ${logName}`);
+    assert.include(stdout, 'Logged: Hello, world!');
   });
 });

samples/system-test/sinks.test.js → samples/test/sinks.test.js

@@ -18,11 +18,12 @@
 const {Logging} = new require('@google-cloud/logging');
 const {Storage} = new require('@google-cloud/storage');
 const {assert} = require('chai');
-const execa = require('execa');
+assert.rejects = require('assert').rejects;
+const cp = require('child_process');
 const uuid = require(`uuid`);
-const assertRejects = require('assert-rejects');
 
-const exec = async cmd => (await execa.shell(cmd)).stdout;
+const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
+
 const cmd = 'node sinks.js';
 const bucketName = `nodejs-logging-sinks-test-${uuid.v4()}`;
 const sinkName = `nodejs-logging-sinks-test-${uuid.v4()}`;
@@ -47,40 +48,40 @@ describe('sinks', () => {
   });
 
   it(`should create a sink`, async () => {
-    const output = await exec(
+    const output = execSync(
       `${cmd} create ${sinkName} ${bucketName} "${filter}"`
     );
-    assert.strictEqual(output, `Created sink ${sinkName} to ${bucketName}`);
+    assert.include(output, `Created sink ${sinkName} to ${bucketName}`);
     const [metadata] = await logging.sink(sinkName).getMetadata();
-    assert.strictEqual(metadata.name, sinkName);
-    assert.match(metadata.destination, new RegExp(bucketName));
-    assert.strictEqual(metadata.filter, filter);
+    assert.include(metadata.name, sinkName);
+    assert.include(metadata.destination, bucketName);
+    assert.include(metadata.filter, filter);
   });
 
-  it(`should get a sink`, async () => {
-    const output = await exec(`${cmd} get ${sinkName}`);
-    assert.match(output, new RegExp(sinkName));
+  it(`should get a sink`, () => {
+    const output = execSync(`${cmd} get ${sinkName}`);
+    assert.include(output, sinkName);
   });
 
-  it(`should list sinks`, async () => {
-    const output = await exec(`${cmd} list`);
-    assert.match(output, /Sinks:/);
-    assert.match(output, new RegExp(sinkName));
+  it(`should list sinks`, () => {
+    const output = execSync(`${cmd} list`);
+    assert.include(output, 'Sinks:');
+    assert.include(output, sinkName);
   });
 
   it(`should update a sink`, async () => {
     const newFilter = 'severity >= WARNING';
-    const output = await exec(`${cmd} update ${sinkName} "${newFilter}"`);
-    assert.match(output, new RegExp(`Sink ${sinkName} updated.`));
+    const output = execSync(`${cmd} update ${sinkName} "${newFilter}"`);
+    assert.include(output, `Sink ${sinkName} updated.`);
     const [metadata] = await logging.sink(sinkName).getMetadata();
-    assert.strictEqual(metadata.name, sinkName);
-    assert.match(metadata.destination, new RegExp(bucketName));
-    assert.strictEqual(metadata.filter, newFilter);
+    assert.include(metadata.name, sinkName);
+    assert.include(metadata.destination, bucketName);
+    assert.include(metadata.filter, newFilter);
   });
 
   it(`should delete a sink`, async () => {
-    const output = await exec(`${cmd} delete ${sinkName}`);
-    assert.strictEqual(output, `Sink ${sinkName} deleted.`);
-    await assertRejects(logging.sink(sinkName).getMetadata());
+    const output = execSync(`${cmd} delete ${sinkName}`);
+    assert.include(output, `Sink ${sinkName} deleted.`);
+    await assert.rejects(logging.sink(sinkName).getMetadata());
   });
 });

test/metadata.ts

@@ -21,7 +21,6 @@ import {GCPEnv} from 'google-auth-library';
 import * as proxyquire from 'proxyquire';
 
 import assertRejects = require('assert-rejects');
-import {detectServiceContext} from '../src/metadata';
 
 let instanceOverride;
 const fakeGcpMetadata = {