feat: use explicit mocha imports (#187)

* feat: use explicit mocha imports * fixy
googleapis · Dec 29, 2019 · 5d8608f · 5d8608f
1 parent 034d991
commit 5d8608f
Show file tree

Hide file tree

Showing 34 changed files with 151 additions and 169 deletions.
diff --git a/templates/typescript_gapic/system-test/.eslintrc.yml.njk b/templates/typescript_gapic/system-test/.eslintrc.yml.njk
diff --git a/templates/typescript_gapic/system-test/install.ts.njk b/templates/typescript_gapic/system-test/install.ts.njk
@@ -19,6 +19,7 @@ limitations under the License.
 {{license.license()}}
 import { packNTest } from 'pack-n-play';
 import { readFileSync } from 'fs';
+import { describe, it } from 'mocha';
 
 describe('typescript consumer tests', () => {
 

diff --git a/templates/typescript_gapic/test/gapic-$service-$version.ts.njk b/templates/typescript_gapic/test/gapic-$service-$version.ts.njk
@@ -20,6 +20,7 @@ limitations under the License.
 {{license.license()}}
 import * as protosTypes from '../protos/protos';
 import * as assert from 'assert';
+import { describe, it } from 'mocha';
 const {{ service.name.toLowerCase() }}Module = require('../src');
 {% if (service.streaming.length > 0) %}
 import {PassThrough} from 'stream';
@@ -56,7 +57,7 @@ function mockSimpleGrpcMethod(expectedRequest: {}, response: {} | null, error: F
             callback(null, response);
         } else {
             callback(null);
-        } 
+        }
     };
 }
 {%- endif %}
@@ -135,7 +136,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
     it('should create a client with no option', () => {
         const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client();
         assert(client);
-    });    
+    });
     it('should create a client with gRPC fallback', () => {
         const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
             fallback: true,
@@ -147,7 +148,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
         it('invokes {{ method.name.toCamelCase() }} without error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             {{ util.initRequestWithHeaderParam(method) }}
@@ -169,7 +170,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
         it('invokes {{ method.name.toCamelCase() }} with error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             {{ util.initRequestWithHeaderParam(method) }}
@@ -195,7 +196,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
         it('invokes {{ method.name.toCamelCase() }} without error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             {{ util.initRequestWithHeaderParam(method) }}
@@ -220,7 +221,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
         it('invokes {{ method.name.toCamelCase() }} with error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             {{ util.initRequestWithHeaderParam(method) }}
@@ -250,7 +251,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
         it('invokes {{ method.name.toCamelCase() }} without error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             const request = {};
@@ -268,10 +269,10 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
             });
             stream.write();
         });
-        it('invokes {{ method.name.toCamelCase() }} with error', done => {            
+        it('invokes {{ method.name.toCamelCase() }} with error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             const request = {};
@@ -288,7 +289,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
                 assert.strictEqual(err.code, FAKE_STATUS_CODE);
                 done();
             });
-            stream.write();  
+            stream.write();
         });
     });
 {%- endfor %}
@@ -297,7 +298,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
         it('invokes {{ method.name.toCamelCase() }} without error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             const request = {};
@@ -313,10 +314,10 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
             });
             stream.write(request);
         });
-        it('invokes {{ method.name.toCamelCase() }} with error', done => {            
+        it('invokes {{ method.name.toCamelCase() }} with error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             const request = {};
@@ -328,7 +329,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
                 assert.fail();
             }).on('error', (err: FakeError) => {
                 assert(err instanceof FakeError);
-                assert.strictEqual(err.code, FAKE_STATUS_CODE);               
+                assert.strictEqual(err.code, FAKE_STATUS_CODE);
                 done();
             });
             stream.write(request);
@@ -340,7 +341,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
         it('invokes {{ method.name.toCamelCase() }} without error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             {{ util.initRequestWithHeaderParam(method) }}
@@ -362,7 +363,7 @@ describe('{{ api.naming.version }}.{{ service.name }}Client', () => {
         it('invokes {{ method.name.toCamelCase() }}Stream without error', done => {
             const client = new {{ service.name.toLowerCase() }}Module.{{ api.naming.version }}.{{ service.name }}Client({
                 credentials: {client_email: 'bogus', private_key: 'bogus'},
-                projectId: 'bogus', 
+                projectId: 'bogus',
             });
             // Mock request
             {{ util.initRequestWithHeaderParam(method) }}

diff --git a/typescript/test/test_application/test_js.ts b/typescript/test/test_application/test_js.ts
@@ -16,6 +16,7 @@ import * as util from 'util';
 import * as child_process from 'child_process';
 import * as fs from 'fs-extra';
 import * as path from 'path';
+import { describe, it } from 'mocha';
 const exec = util.promisify(child_process.exec);
 const SHOWCASE_LIB = path.join(
   __dirname,

diff --git a/typescript/test/test_application/test_ts.ts b/typescript/test/test_application/test_ts.ts
@@ -16,6 +16,7 @@ import * as util from 'util';
 import * as child_process from 'child_process';
 import * as fs from 'fs-extra';
 import * as path from 'path';
+import { describe, it } from 'mocha';
 const exec = util.promisify(child_process.exec);
 const SHOWCASE_LIB = path.join(
   __dirname,

diff --git a/typescript/test/test_application_js/browser-test.js b/typescript/test/test_application_js/browser-test.js
@@ -14,6 +14,7 @@
 
 const child_process = require('child_process');
 const util = require('util');
+const {describe, it} = require('mocha');
 const serverProcess = require('./server');
 const exec = util.promisify(child_process.exec);
 

diff --git a/typescript/test/test_application_js/index.js b/typescript/test/test_application_js/index.js
@@ -1,4 +1,5 @@
 const assert = require('assert');
+const {describe, it} = require('mocha');
 const showcase = require('showcase');
 
 // Fake auth client for fallback

diff --git a/typescript/test/test_application_js/integration-test.js b/typescript/test/test_application_js/integration-test.js
@@ -14,6 +14,7 @@
 
 const util = require('util');
 const child_process = require('child_process');
+const {describe, it} = require('mocha');
 const exec = util.promisify(child_process.exec);
 const fs = require('fs-extra');
 const path = require('path');

diff --git a/typescript/test/testdata/keymanager/system-test/.eslintrc.yml.baseline b/typescript/test/testdata/keymanager/system-test/.eslintrc.yml.baseline
diff --git a/typescript/test/testdata/keymanager/system-test/install.ts.baseline b/typescript/test/testdata/keymanager/system-test/install.ts.baseline
@@ -18,6 +18,7 @@
 
 import { packNTest } from 'pack-n-play';
 import { readFileSync } from 'fs';
+import { describe, it } from 'mocha';
 
 describe('typescript consumer tests', () => {