From b1f89800a76aec6ab87ac4ff5d865e75d8d3973d Mon Sep 17 00:00:00 2001
From: Justin Beckwith <justin.beckwith@gmail.com>
Date: Mon, 30 Dec 2019 15:44:18 -0800
Subject: [PATCH] refactor: use explicit mocha imports (#505)

---
 packages/google-cloud-vision/samples/.eslintrc.yml             | 1 -
 packages/google-cloud-vision/smoke-test/.eslintrc.yml          | 2 --
 .../smoke-test/image_annotator_smoke_test.js                   | 2 ++
 packages/google-cloud-vision/system-test/.eslintrc.yml         | 2 --
 .../system-test/image_annotator_smoke_test.js                  | 2 ++
 packages/google-cloud-vision/system-test/vision-v1p2beta1.js   | 2 ++
 packages/google-cloud-vision/system-test/vision.js             | 1 +
 packages/google-cloud-vision/test/.eslintrc.yml                | 3 ---
 packages/google-cloud-vision/test/gapic-v1.js                  | 1 +
 packages/google-cloud-vision/test/gapic-v1p1beta1.js           | 1 +
 packages/google-cloud-vision/test/gapic-v1p2beta1.js           | 1 +
 packages/google-cloud-vision/test/gapic-v1p3beta1.js           | 1 +
 packages/google-cloud-vision/test/gapic-v1p4beta1.js           | 1 +
 packages/google-cloud-vision/test/helpers.test.js              | 1 +
 packages/google-cloud-vision/test/index.test.js                | 1 +
 15 files changed, 14 insertions(+), 8 deletions(-)
 delete mode 100644 packages/google-cloud-vision/test/.eslintrc.yml

diff --git a/packages/google-cloud-vision/samples/.eslintrc.yml b/packages/google-cloud-vision/samples/.eslintrc.yml
index 0aa37ac630e..282535f55f6 100644
--- a/packages/google-cloud-vision/samples/.eslintrc.yml
+++ b/packages/google-cloud-vision/samples/.eslintrc.yml
@@ -1,4 +1,3 @@
 ---
 rules:
   no-console: off
-  node/no-missing-require: off
diff --git a/packages/google-cloud-vision/smoke-test/.eslintrc.yml b/packages/google-cloud-vision/smoke-test/.eslintrc.yml
index f9605165c0f..282535f55f6 100644
--- a/packages/google-cloud-vision/smoke-test/.eslintrc.yml
+++ b/packages/google-cloud-vision/smoke-test/.eslintrc.yml
@@ -1,5 +1,3 @@
 ---
-env:
-  mocha: true
 rules:
   no-console: off
diff --git a/packages/google-cloud-vision/smoke-test/image_annotator_smoke_test.js b/packages/google-cloud-vision/smoke-test/image_annotator_smoke_test.js
index 925483dd3d5..f916c869401 100644
--- a/packages/google-cloud-vision/smoke-test/image_annotator_smoke_test.js
+++ b/packages/google-cloud-vision/smoke-test/image_annotator_smoke_test.js
@@ -14,6 +14,8 @@
 
 'use strict';
 
+const {describe, it} = require('mocha');
+
 describe('ImageAnnotatorSmokeTest', () => {
   it('successfully makes a call to the service', done => {
     const vision = require('../src');
diff --git a/packages/google-cloud-vision/system-test/.eslintrc.yml b/packages/google-cloud-vision/system-test/.eslintrc.yml
index 3bbc66b8785..4721890f9ad 100644
--- a/packages/google-cloud-vision/system-test/.eslintrc.yml
+++ b/packages/google-cloud-vision/system-test/.eslintrc.yml
@@ -1,6 +1,4 @@
 ---
-env:
-  mocha: true
 rules:
   no-console: off
   node/no-unsupported-features/es-syntax: off
diff --git a/packages/google-cloud-vision/system-test/image_annotator_smoke_test.js b/packages/google-cloud-vision/system-test/image_annotator_smoke_test.js
index 131d2f65a8c..7907d507a61 100644
--- a/packages/google-cloud-vision/system-test/image_annotator_smoke_test.js
+++ b/packages/google-cloud-vision/system-test/image_annotator_smoke_test.js
@@ -14,6 +14,8 @@
 
 'use strict';
 
+const {describe, it} = require('mocha');
+
 describe('ImageAnnotatorSmokeTest', () => {
   it('successfully makes a call to the service', done => {
     const vision = require('../src');
diff --git a/packages/google-cloud-vision/system-test/vision-v1p2beta1.js b/packages/google-cloud-vision/system-test/vision-v1p2beta1.js
index 5701d5615ff..8c2ce8a591b 100644
--- a/packages/google-cloud-vision/system-test/vision-v1p2beta1.js
+++ b/packages/google-cloud-vision/system-test/vision-v1p2beta1.js
@@ -14,6 +14,8 @@
 
 'use strict';
 
+const {describe, it} = require('mocha');
+
 describe('ImageAnnotatorSmokeTest', () => {
   it('successfully makes a call to the service', done => {
     const vision = require('../src');
diff --git a/packages/google-cloud-vision/system-test/vision.js b/packages/google-cloud-vision/system-test/vision.js
index d4003618f16..d3cd8db9521 100644
--- a/packages/google-cloud-vision/system-test/vision.js
+++ b/packages/google-cloud-vision/system-test/vision.js
@@ -17,6 +17,7 @@
 'use strict';
 
 const assert = require('assert');
+const {describe, it, before, after} = require('mocha');
 const fs = require('fs');
 const path = require('path');
 const {Storage} = require('@google-cloud/storage');
diff --git a/packages/google-cloud-vision/test/.eslintrc.yml b/packages/google-cloud-vision/test/.eslintrc.yml
deleted file mode 100644
index 6db2a46c535..00000000000
--- a/packages/google-cloud-vision/test/.eslintrc.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-env:
-  mocha: true
diff --git a/packages/google-cloud-vision/test/gapic-v1.js b/packages/google-cloud-vision/test/gapic-v1.js
index 7ab0e0c41a2..4bf1c4fcf56 100644
--- a/packages/google-cloud-vision/test/gapic-v1.js
+++ b/packages/google-cloud-vision/test/gapic-v1.js
@@ -15,6 +15,7 @@
 'use strict';
 
 const assert = require('assert');
+const {describe, it} = require('mocha');
 
 const visionModule = require('../src');
 
diff --git a/packages/google-cloud-vision/test/gapic-v1p1beta1.js b/packages/google-cloud-vision/test/gapic-v1p1beta1.js
index 3a9438f0fdd..38a6fe7e212 100644
--- a/packages/google-cloud-vision/test/gapic-v1p1beta1.js
+++ b/packages/google-cloud-vision/test/gapic-v1p1beta1.js
@@ -15,6 +15,7 @@
 'use strict';
 
 const assert = require('assert');
+const {describe, it} = require('mocha');
 
 const visionModule = require('../src');
 
diff --git a/packages/google-cloud-vision/test/gapic-v1p2beta1.js b/packages/google-cloud-vision/test/gapic-v1p2beta1.js
index c1549b98733..572fc4d8e9c 100644
--- a/packages/google-cloud-vision/test/gapic-v1p2beta1.js
+++ b/packages/google-cloud-vision/test/gapic-v1p2beta1.js
@@ -15,6 +15,7 @@
 'use strict';
 
 const assert = require('assert');
+const {describe, it} = require('mocha');
 
 const visionModule = require('../src');
 
diff --git a/packages/google-cloud-vision/test/gapic-v1p3beta1.js b/packages/google-cloud-vision/test/gapic-v1p3beta1.js
index 94cd12fbd8f..cd008feeb15 100644
--- a/packages/google-cloud-vision/test/gapic-v1p3beta1.js
+++ b/packages/google-cloud-vision/test/gapic-v1p3beta1.js
@@ -15,6 +15,7 @@
 'use strict';
 
 const assert = require('assert');
+const {describe, it} = require('mocha');
 
 const visionModule = require('../src');
 
diff --git a/packages/google-cloud-vision/test/gapic-v1p4beta1.js b/packages/google-cloud-vision/test/gapic-v1p4beta1.js
index cf898903789..b865af2fa28 100644
--- a/packages/google-cloud-vision/test/gapic-v1p4beta1.js
+++ b/packages/google-cloud-vision/test/gapic-v1p4beta1.js
@@ -15,6 +15,7 @@
 'use strict';
 
 const assert = require('assert');
+const {describe, it} = require('mocha');
 
 const visionModule = require('../src');
 
diff --git a/packages/google-cloud-vision/test/helpers.test.js b/packages/google-cloud-vision/test/helpers.test.js
index 05c05f2ffe0..2d5cfdb9d00 100644
--- a/packages/google-cloud-vision/test/helpers.test.js
+++ b/packages/google-cloud-vision/test/helpers.test.js
@@ -17,6 +17,7 @@
 'use strict';
 
 const assert = require('assert');
+const {describe, it, afterEach} = require('mocha');
 const fs = require('fs');
 const is = require('is');
 const sinon = require('sinon');
diff --git a/packages/google-cloud-vision/test/index.test.js b/packages/google-cloud-vision/test/index.test.js
index 37077ce7df4..7b3a1513d41 100644
--- a/packages/google-cloud-vision/test/index.test.js
+++ b/packages/google-cloud-vision/test/index.test.js
@@ -15,6 +15,7 @@
 'use strict';
 
 const assert = require('assert');
+const {describe, it} = require('mocha');
 
 const vision = require('../');