From e35ee208b2e0d1589d2d978dddf2dc531e28f1d4 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 18 Sep 2018 11:22:08 -0700 Subject: [PATCH] Enable no-var in eslint (#177) --- packages/google-cloud-node/.eslintrc.yml | 1 + packages/google-cloud-node/src/helpers.js | 14 ++-- .../system-test/speech_smoke_test.js | 18 ++--- .../speech_smoke_test_v1p1beta1.js | 18 ++--- .../google-cloud-node/test/gapic-v1.test.js | 80 +++++++++---------- .../google-cloud-node/test/helpers.test.js | 62 +++++++------- 6 files changed, 97 insertions(+), 96 deletions(-) diff --git a/packages/google-cloud-node/.eslintrc.yml b/packages/google-cloud-node/.eslintrc.yml index bed57fbc42c7..65f1dce6c0c6 100644 --- a/packages/google-cloud-node/.eslintrc.yml +++ b/packages/google-cloud-node/.eslintrc.yml @@ -11,3 +11,4 @@ rules: block-scoped-var: error eqeqeq: error no-warning-comments: warn + no-var: error diff --git a/packages/google-cloud-node/src/helpers.js b/packages/google-cloud-node/src/helpers.js index d58eb9cf6a58..94b12c5ff665 100644 --- a/packages/google-cloud-node/src/helpers.js +++ b/packages/google-cloud-node/src/helpers.js @@ -16,17 +16,17 @@ 'use strict'; -var common = require('@google-cloud/common'); -var pumpify = require('pumpify'); -var streamEvents = require('stream-events'); -var through = require('through2'); +let common = require('@google-cloud/common'); +let pumpify = require('pumpify'); +let streamEvents = require('stream-events'); +let through = require('through2'); /*! * Return a dictionary-like object with helpers to augment the Speech * GAPIC. */ module.exports = () => { - var methods = {}; + let methods = {}; /** * Performs bidirectional streaming speech recognition: receive results while @@ -69,9 +69,9 @@ module.exports = () => { } // Format the audio content as input request for pipeline - var recognizeStream = streamEvents(pumpify.obj()); + let recognizeStream = streamEvents(pumpify.obj()); - var requestStream = this._innerApiCalls + let requestStream = this._innerApiCalls .streamingRecognize(options) .on('error', err => { recognizeStream.destroy(err); diff --git a/packages/google-cloud-node/system-test/speech_smoke_test.js b/packages/google-cloud-node/system-test/speech_smoke_test.js index f23ad08e0815..5cc849d92679 100644 --- a/packages/google-cloud-node/system-test/speech_smoke_test.js +++ b/packages/google-cloud-node/system-test/speech_smoke_test.js @@ -18,30 +18,30 @@ describe('SpeechSmokeTest', () => { it('successfully makes a call to the service', done => { const speech = require('../src'); - var client = new speech.v1.SpeechClient({ + let client = new speech.v1.SpeechClient({ // optional auth parameters. }); - var languageCode = 'en-US'; - var sampleRateHertz = 44100; - var encoding = 'FLAC'; - var config = { + let languageCode = 'en-US'; + let sampleRateHertz = 44100; + let encoding = 'FLAC'; + let config = { languageCode: languageCode, sampleRateHertz: sampleRateHertz, encoding: encoding, }; - var uri = 'gs://gapic-toolkit/hello.flac'; - var audio = { + let uri = 'gs://gapic-toolkit/hello.flac'; + let audio = { uri: uri, }; - var request = { + let request = { config: config, audio: audio, }; client .recognize(request) .then(responses => { - var response = responses[0]; + let response = responses[0]; console.log(response); }) .then(done) diff --git a/packages/google-cloud-node/system-test/speech_smoke_test_v1p1beta1.js b/packages/google-cloud-node/system-test/speech_smoke_test_v1p1beta1.js index c8e26b675ce0..cad4d5a96095 100644 --- a/packages/google-cloud-node/system-test/speech_smoke_test_v1p1beta1.js +++ b/packages/google-cloud-node/system-test/speech_smoke_test_v1p1beta1.js @@ -18,30 +18,30 @@ describe('SpeechSmokeTest v1p1beta1', () => { it('successfully makes a call to the service', done => { const speech = require('../src'); - var client = new speech.v1p1beta1.SpeechClient({ + let client = new speech.v1p1beta1.SpeechClient({ // optional auth parameters. }); - var languageCode = 'en-US'; - var sampleRateHertz = 44100; - var encoding = 'FLAC'; - var config = { + let languageCode = 'en-US'; + let sampleRateHertz = 44100; + let encoding = 'FLAC'; + let config = { languageCode: languageCode, sampleRateHertz: sampleRateHertz, encoding: encoding, }; - var uri = 'gs://gapic-toolkit/hello.flac'; - var audio = { + let uri = 'gs://gapic-toolkit/hello.flac'; + let audio = { uri: uri, }; - var request = { + let request = { config: config, audio: audio, }; client .recognize(request) .then(responses => { - var response = responses[0]; + let response = responses[0]; console.log(response); }) .then(done) diff --git a/packages/google-cloud-node/test/gapic-v1.test.js b/packages/google-cloud-node/test/gapic-v1.test.js index 75dd23425e33..957c278029ce 100644 --- a/packages/google-cloud-node/test/gapic-v1.test.js +++ b/packages/google-cloud-node/test/gapic-v1.test.js @@ -18,38 +18,38 @@ const assert = require('assert'); const speechModule = require('../src'); -var FAKE_STATUS_CODE = 1; -var error = new Error(); +let FAKE_STATUS_CODE = 1; +let error = new Error(); error.code = FAKE_STATUS_CODE; describe('SpeechClient', () => { describe('recognize', () => { it('invokes recognize without error', done => { - var client = new speechModule.v1.SpeechClient({ + let client = new speechModule.v1.SpeechClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var encoding = 'FLAC'; - var sampleRateHertz = 44100; - var languageCode = 'en-US'; - var config = { + let encoding = 'FLAC'; + let sampleRateHertz = 44100; + let languageCode = 'en-US'; + let config = { encoding: encoding, sampleRateHertz: sampleRateHertz, languageCode: languageCode, }; - var uri = 'gs://bucket_name/file_name.flac'; - var audio = { + let uri = 'gs://bucket_name/file_name.flac'; + let audio = { uri: uri, }; - var request = { + let request = { config: config, audio: audio, }; // Mock response - var expectedResponse = {}; + let expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.recognize = mockSimpleGrpcMethod( @@ -65,25 +65,25 @@ describe('SpeechClient', () => { }); it('invokes recognize with error', done => { - var client = new speechModule.v1.SpeechClient({ + let client = new speechModule.v1.SpeechClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var encoding = 'FLAC'; - var sampleRateHertz = 44100; - var languageCode = 'en-US'; - var config = { + let encoding = 'FLAC'; + let sampleRateHertz = 44100; + let languageCode = 'en-US'; + let config = { encoding: encoding, sampleRateHertz: sampleRateHertz, languageCode: languageCode, }; - var uri = 'gs://bucket_name/file_name.flac'; - var audio = { + let uri = 'gs://bucket_name/file_name.flac'; + let audio = { uri: uri, }; - var request = { + let request = { config: config, audio: audio, }; @@ -106,31 +106,31 @@ describe('SpeechClient', () => { describe('longRunningRecognize', function() { it('invokes longRunningRecognize without error', done => { - var client = new speechModule.v1.SpeechClient({ + let client = new speechModule.v1.SpeechClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var encoding = 'FLAC'; - var sampleRateHertz = 44100; - var languageCode = 'en-US'; - var config = { + let encoding = 'FLAC'; + let sampleRateHertz = 44100; + let languageCode = 'en-US'; + let config = { encoding: encoding, sampleRateHertz: sampleRateHertz, languageCode: languageCode, }; - var uri = 'gs://bucket_name/file_name.flac'; - var audio = { + let uri = 'gs://bucket_name/file_name.flac'; + let audio = { uri: uri, }; - var request = { + let request = { config: config, audio: audio, }; // Mock response - var expectedResponse = {}; + let expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.longRunningRecognize = mockLongRunningGrpcMethod( @@ -141,7 +141,7 @@ describe('SpeechClient', () => { client .longRunningRecognize(request) .then(responses => { - var operation = responses[0]; + let operation = responses[0]; return operation.promise(); }) .then(responses => { @@ -154,25 +154,25 @@ describe('SpeechClient', () => { }); it('invokes longRunningRecognize with error', done => { - var client = new speechModule.v1.SpeechClient({ + let client = new speechModule.v1.SpeechClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var encoding = 'FLAC'; - var sampleRateHertz = 44100; - var languageCode = 'en-US'; - var config = { + let encoding = 'FLAC'; + let sampleRateHertz = 44100; + let languageCode = 'en-US'; + let config = { encoding: encoding, sampleRateHertz: sampleRateHertz, languageCode: languageCode, }; - var uri = 'gs://bucket_name/file_name.flac'; - var audio = { + let uri = 'gs://bucket_name/file_name.flac'; + let audio = { uri: uri, }; - var request = { + let request = { config: config, audio: audio, }; @@ -187,7 +187,7 @@ describe('SpeechClient', () => { client .longRunningRecognize(request) .then(responses => { - var operation = responses[0]; + let operation = responses[0]; return operation.promise(); }) .then(() => { @@ -201,7 +201,7 @@ describe('SpeechClient', () => { }); it('has longrunning decoder functions', () => { - var client = new speechModule.v1.SpeechClient({ + let client = new speechModule.v1.SpeechClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); @@ -233,7 +233,7 @@ function mockSimpleGrpcMethod(expectedRequest, response, error) { function mockLongRunningGrpcMethod(expectedRequest, response, error) { return request => { assert.deepStrictEqual(request, expectedRequest); - var mockOperation = { + let mockOperation = { promise: function() { return new Promise((resolve, reject) => { if (error) { diff --git a/packages/google-cloud-node/test/helpers.test.js b/packages/google-cloud-node/test/helpers.test.js index 839ecc2ad7c6..5f2f9280a3eb 100644 --- a/packages/google-cloud-node/test/helpers.test.js +++ b/packages/google-cloud-node/test/helpers.test.js @@ -16,18 +16,18 @@ 'use strict'; -var assert = require('assert'); -var Buffer = require('safe-buffer').Buffer; -var common = require('@google-cloud/common'); -var proxyquire = require('proxyquire'); -var sinon = require('sinon'); -var stream = require('stream'); +let assert = require('assert'); +let Buffer = require('safe-buffer').Buffer; +let common = require('@google-cloud/common'); +let proxyquire = require('proxyquire'); +let sinon = require('sinon'); +let stream = require('stream'); describe('Speech helper methods', () => { - var client; - var FakeApiErrorOverride; - var sandbox = sinon.createSandbox(); - var speech; + let client; + let FakeApiErrorOverride; + let sandbox = sinon.createSandbox(); + let speech; class FakeApiError extends common.util.ApiError { constructor(error) { @@ -60,22 +60,22 @@ describe('Speech helper methods', () => { }); describe('streamingRecognize', () => { - var CONFIG = { + let CONFIG = { config: {encoding: 'LINEAR16', languageCode: 'en-us', sampleRate: 16000}, }; - var OPTIONS = {timeout: Infinity}; + let OPTIONS = {timeout: Infinity}; it('writes the config to the resulting stream', done => { // Stub the underlying _streamingRecognize method to just return // a bogus stream. - var requestStream = new stream.PassThrough({objectMode: true}); - var sr = sandbox + let requestStream = new stream.PassThrough({objectMode: true}); + let sr = sandbox .stub(client._innerApiCalls, 'streamingRecognize') .returns(requestStream); // Call the new helper method and establish that the config was // forwarded as expected. - var userStream = client.streamingRecognize(CONFIG, OPTIONS); + let userStream = client.streamingRecognize(CONFIG, OPTIONS); // Establish that the underlying streamingRecognize was called with // the options. @@ -96,12 +96,12 @@ describe('Speech helper methods', () => { it('does not require options', () => { // Stub the underlying _streamingRecognize method to just return // a bogus stream. - var requestStream = new stream.PassThrough({objectMode: true}); - var sr = sandbox + let requestStream = new stream.PassThrough({objectMode: true}); + let sr = sandbox .stub(client._innerApiCalls, 'streamingRecognize') .returns(requestStream); - var userStream = client.streamingRecognize(CONFIG); + let userStream = client.streamingRecognize(CONFIG); userStream.emit('writing'); @@ -112,14 +112,14 @@ describe('Speech helper methods', () => { it('destroys the user stream when the request stream errors', done => { // Stub the underlying _streamingRecognize method to just return // a bogus stream. - var requestStream = new stream.PassThrough({objectMode: true}); + let requestStream = new stream.PassThrough({objectMode: true}); sandbox .stub(client._innerApiCalls, 'streamingRecognize') .returns(requestStream); - var userStream = client.streamingRecognize(CONFIG, OPTIONS); + let userStream = client.streamingRecognize(CONFIG, OPTIONS); - var error = new Error('Request stream error'); + let error = new Error('Request stream error'); userStream.once('error', err => { assert.strictEqual(err, error); @@ -132,15 +132,15 @@ describe('Speech helper methods', () => { it('destroys the user stream when the response contains an error', done => { // Stub the underlying _streamingRecognize method to just return // a bogus stream. - var requestStream = new stream.PassThrough({objectMode: true}); + let requestStream = new stream.PassThrough({objectMode: true}); sandbox .stub(client._innerApiCalls, 'streamingRecognize') .returns(requestStream); - var userStream = client.streamingRecognize(CONFIG, OPTIONS); + let userStream = client.streamingRecognize(CONFIG, OPTIONS); - var error = {}; - var fakeApiError = {}; + let error = {}; + let fakeApiError = {}; FakeApiErrorOverride = err => { assert.strictEqual(err, error); @@ -159,14 +159,14 @@ describe('Speech helper methods', () => { it('re-emits response from the request stream', done => { // Stub the underlying _streamingRecognize method to just return // a bogus stream. - var requestStream = new stream.PassThrough({objectMode: true}); + let requestStream = new stream.PassThrough({objectMode: true}); sandbox .stub(client._innerApiCalls, 'streamingRecognize') .returns(requestStream); - var userStream = client.streamingRecognize(CONFIG, OPTIONS); + let userStream = client.streamingRecognize(CONFIG, OPTIONS); - var response = {}; + let response = {}; userStream.on('response', _response => { assert.strictEqual(_response, response); @@ -180,13 +180,13 @@ describe('Speech helper methods', () => { it('wraps incoming audio data', done => { // Stub the underlying _streamingRecognize method to just return // a bogus stream. - var requestStream = new stream.PassThrough({objectMode: true}); + let requestStream = new stream.PassThrough({objectMode: true}); sandbox .stub(client._innerApiCalls, 'streamingRecognize') .returns(requestStream); - var userStream = client.streamingRecognize(CONFIG, OPTIONS); - var audioContent = Buffer.from('audio content'); + let userStream = client.streamingRecognize(CONFIG, OPTIONS); + let audioContent = Buffer.from('audio content'); requestStream._write = (data, enc, next) => { assert.deepStrictEqual(data, {