refactor: use explicit mocha imports (#1175)

JustinBeckwith · kjin · Benjamin E. Coe · commit a6f825ebad71 · 2020-01-02T13:59:57.000-08:00
Co-authored-by: Kelvin Jin &lt;kelvinjin@google.com&gt;
diff --git a/system-test/trace-express.js b/system-test/trace-express.js
@@ -44,6 +44,7 @@ const tracer = require('../').start({
 require('hard-rejection')();
 
 const assert = require('assert');
+const {describe, it} = require('mocha');
 const googleAuth = require('google-auto-auth');
 const got = require('got');
 const queryString = require('querystring');
diff --git a/test/plugins/test-cls-bluebird.ts b/test/plugins/test-cls-bluebird.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 import {bluebird_3 as BluebirdPromise} from '../../src/plugins/types';
 import {Trace} from '../../src/trace';
diff --git a/test/plugins/test-trace-google-gax.ts b/test/plugins/test-trace-google-gax.ts
@@ -34,6 +34,7 @@
  */
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 import * as testTraceModule from '../trace';
 import {describeInterop} from '../utils';
diff --git a/test/plugins/test-trace-grpc.ts b/test/plugins/test-trace-grpc.ts
@@ -19,6 +19,7 @@ import { TraceLabels } from '../../src/trace-labels';
 import * as TracingPolicy from '../../src/tracing-policy';
 import * as util from '../../src/util';
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import { asRootSpanData, describeInterop, DEFAULT_SPAN_DURATION, assertSpanDuration } from '../utils';
 import { Span } from '../../src/plugin-types';
 import { FORCE_NEW } from '../../src/util';
diff --git a/test/plugins/test-trace-http.ts b/test/plugins/test-trace-http.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import {EventEmitter} from 'events';
 import * as httpModule from 'http';
 import * as httpsModule from 'https';
diff --git a/test/plugins/test-trace-http2.ts b/test/plugins/test-trace-http2.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 // This is imported only for types. Generated .js file should NOT load 'http2'
 // in this place. It is dynamically loaded later from each test suite below.
 import * as http2Types from 'http2';
diff --git a/test/plugins/test-trace-knex.ts b/test/plugins/test-trace-knex.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as knexTypes from 'knex';
 
 import {Tracer} from '../../src/plugin-types';
diff --git a/test/plugins/test-trace-mongoose-async-await.ts b/test/plugins/test-trace-mongoose-async-await.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as mongooseTypes from 'mongoose';
 
 import * as traceTestModule from '../trace';
diff --git a/test/plugins/test-trace-node-fetch.ts b/test/plugins/test-trace-node-fetch.ts
@@ -15,6 +15,7 @@
 import * as fetchTypes from 'node-fetch'; // For types only.
 import * as testTraceModule from '../trace';
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import {describeInterop} from '../utils';
 import {Express4} from '../web-frameworks/express';
 import {Express4Secure} from '../web-frameworks/express-secure';
diff --git a/test/test-agent-stopped.ts b/test/test-agent-stopped.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as http from 'http';
 import * as traceTestModule from './trace';
 import { pluginLoader, PluginLoaderState } from '../src/trace-plugin-loader';
diff --git a/test/test-cls-ah.ts b/test/test-cls-ah.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as asyncHooksModule from 'async_hooks';
 import * as semver from 'semver';
 
diff --git a/test/test-cls.ts b/test/test-cls.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import {EventEmitter} from 'events';
 import * as semver from 'semver';
 import {inspect} from 'util';
diff --git a/test/test-config-plugins.ts b/test/test-config-plugins.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 import {defaultConfig} from '../src/config';
 import {StackdriverTracerComponents} from '../src/trace-api';
diff --git a/test/test-config-priority.ts b/test/test-config-priority.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as path from 'path';
 
 import {Trace} from '../src/trace';
diff --git a/test/test-config.ts b/test/test-config.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as semver from 'semver';
 import * as util from 'util';
 
diff --git a/test/test-default-ignore-ah-health.ts b/test/test-default-ignore-ah-health.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 import * as trace from './trace';
 
diff --git a/test/test-env-log-level.ts b/test/test-env-log-level.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as shimmer from 'shimmer';
 
 import * as logger from '../src/logger';
diff --git a/test/test-modules-loaded-before-agent.ts b/test/test-modules-loaded-before-agent.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as shimmer from 'shimmer';
 
 import * as log from '../src/logger';
diff --git a/test/test-plugin-loader.ts b/test/test-plugin-loader.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as path from 'path';
 
 import {OpenCensusPropagation} from '../src/config';
diff --git a/test/test-preloaded-agent.ts b/test/test-preloaded-agent.ts
@@ -15,6 +15,7 @@
 import * as semver from 'semver';
 import { execSync } from 'child_process';
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 describe('preloaded agent', () => {
   it('should start automatically when preloaded using --require', () => {
diff --git a/test/test-span-data.ts b/test/test-span-data.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 import {Constants, SpanType} from '../src/constants';
 import {BaseSpanData, ChildSpanData, RootSpanData} from '../src/span-data';
diff --git a/test/test-trace-api-none-cls.ts b/test/test-trace-api-none-cls.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 import {SpanType} from '../src/constants';
 import {Tracer} from '../src/plugin-types';
diff --git a/test/test-trace-api.ts b/test/test-trace-api.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 import {cls, TraceCLS, TraceCLSMechanism} from '../src/cls';
 import {
diff --git a/test/test-trace-cluster.ts b/test/test-trace-cluster.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import axiosModule from 'axios';
 import * as cluster from 'cluster';
 import {Server} from 'http';
diff --git a/test/test-trace-hapi-tails.ts b/test/test-trace-hapi-tails.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import axiosModule from 'axios';
 import * as semver from 'semver';
 
diff --git a/test/test-trace-policy.ts b/test/test-trace-policy.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 import {RequestDetails} from '../src/config';
 import {
diff --git a/test/test-trace-uncaught-exception.ts b/test/test-trace-uncaught-exception.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 
 import {Logger} from '../src/logger';
 import {Trace} from '../src/trace';
diff --git a/test/test-trace-web-frameworks.ts b/test/test-trace-web-frameworks.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import axiosModule from 'axios';
 import * as semver from 'semver';
 
diff --git a/test/test-trace-writer.ts b/test/test-trace-writer.ts
@@ -14,6 +14,7 @@
 
 import {Service, DecorateRequestOptions} from '@google-cloud/common';
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import {GoogleAuth} from 'google-auth-library';
 import {JWTInput} from 'google-auth-library/build/src/auth/credentials';
 import {RefreshOptions} from 'google-auth-library/build/src/auth/oauth2client';
diff --git a/test/test-util.ts b/test/test-util.ts
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import {inspect} from 'util';
 
 import {Constants} from '../src/constants';
diff --git a/test/trace.ts b/test/trace.ts
@@ -33,6 +33,7 @@
  */
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as shimmer from 'shimmer';
 
 import * as trace from '../src';
diff --git a/test/utils.ts b/test/utils.ts
@@ -15,6 +15,7 @@
 // TODO(kjin): This file should supercede plugins/common.ts.
 
 import * as assert from 'assert';
+import {describe, it} from 'mocha';
 import * as fs from 'fs';
 import * as semver from 'semver';
 
