Skip to content

Commit

Permalink
chore(deps): update dependency gts to v1 (#246)
Browse files Browse the repository at this point in the history
  • Loading branch information
@renovate @JustinBeckwith
renovate[bot] authored and JustinBeckwith committed May 3, 2019
1 parent 3b02c23 commit bc9472b
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 70 deletions.
2 changes: 1 addition & 1 deletion packages/google-cloud-translate/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"eslint-config-prettier": "^4.0.0",
"eslint-plugin-node": "^9.0.0",
"eslint-plugin-prettier": "^3.0.0",
"gts": "^0.9.0",
"gts": "^1.0.0",
"intelli-espower-loader": "^1.0.1",
"jsdoc": "^3.5.5",
"jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git",
Expand Down
11 changes: 7 additions & 4 deletions packages/google-cloud-translate/system-test/translate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ describe('translate', () => {
const [results] = await translate.translate(input, opts);
const translation = results.split(/<\/*body>/g)[1].trim();
assert.strictEqual(
removeSymbols(translation), INPUT[0].expectedTranslation);
removeSymbols(translation),
INPUT[0].expectedTranslation
);
});
});

Expand All @@ -106,7 +108,7 @@ describe('translate', () => {

it('should accept a target language', async () => {
const [languages] = await translate.getLanguages('es');
const englishResult = languages.filter((language) => {
const englishResult = languages.filter(language => {
return language.code === 'en';
})[0];
assert.deepStrictEqual(englishResult, {
Expand All @@ -120,12 +122,13 @@ describe('translate', () => {
beforeEach(() => {
if (!API_KEY) {
throw new Error(
'The `TRANSLATE_API_KEY` environment variable is required!');
'The `TRANSLATE_API_KEY` environment variable is required!'
);
}
translate = new Translate({key: API_KEY});
});

it('should use an API key to authenticate', (done) => {
it('should use an API key to authenticate', done => {
translate.getLanguages(done);
});
});
Expand Down
153 changes: 88 additions & 65 deletions packages/google-cloud-translate/test/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
*/

import {DecorateRequestOptions, util} from '@google-cloud/common';
import {BodyResponseCallback, MakeRequestConfig} from '@google-cloud/common/build/src/util';
import {
BodyResponseCallback,
MakeRequestConfig,
} from '@google-cloud/common/build/src/util';
import * as pfy from '@google-cloud/promisify';
import * as assert from 'assert';
import * as extend from 'extend';
Expand All @@ -39,8 +42,10 @@ const fakePromisify = extend({}, pfy, {

const fakeUtil = extend({}, util, {
makeRequest(
opts: DecorateRequestOptions, cfg: MakeRequestConfig,
cb: BodyResponseCallback) {
opts: DecorateRequestOptions,
cfg: MakeRequestConfig,
cb: BodyResponseCallback
) {
if (makeRequestOverride) {
return makeRequestOverride(opts, cfg, cb);
}
Expand Down Expand Up @@ -69,12 +74,12 @@ describe('Translate v2', () => {

before(() => {
Translate = proxyquire('../src/v2', {
'@google-cloud/common': {
util: fakeUtil,
Service: FakeService,
},
'@google-cloud/promisify': fakePromisify
}).Translate;
'@google-cloud/common': {
util: fakeUtil,
Service: FakeService,
},
'@google-cloud/promisify': fakePromisify,
}).Translate;
});

beforeEach(() => {
Expand All @@ -95,7 +100,7 @@ describe('Translate v2', () => {
// tslint:disable-next-line no-any
const calledWith = (translate as any).calledWith_[0];
const baseUrl =
'https://translation.googleapis.com/language/translate/v2';
'https://translation.googleapis.com/language/translate/v2';

assert.strictEqual(calledWith.baseUrl, baseUrl);
assert.deepStrictEqual(calledWith.scopes, [
Expand Down Expand Up @@ -243,13 +248,15 @@ describe('Translate v2', () => {

it('should return an array if input was an array', done => {
translate.detect(
[INPUT], (err: Error, results: {}, apiResponse_: {}) => {
assert.ifError(err);
assert.deepStrictEqual(results, [expectedResults]);
assert.strictEqual(apiResponse_, apiResponse);
assert.deepStrictEqual(apiResponse_, originalApiResponse);
done();
});
[INPUT],
(err: Error, results: {}, apiResponse_: {}) => {
assert.ifError(err);
assert.deepStrictEqual(results, [expectedResults]);
assert.strictEqual(apiResponse_, apiResponse);
assert.deepStrictEqual(apiResponse_, originalApiResponse);
done();
}
);
});
});
});
Expand Down Expand Up @@ -291,12 +298,13 @@ describe('Translate v2', () => {

it('should exec callback with error & API response', done => {
translate.getLanguages(
(err: Error, languages: {}, apiResponse_: {}) => {
assert.strictEqual(err, error);
assert.strictEqual(languages, null);
assert.strictEqual(apiResponse_, apiResponse);
done();
});
(err: Error, languages: {}, apiResponse_: {}) => {
assert.strictEqual(err, error);
assert.strictEqual(languages, null);
assert.strictEqual(apiResponse_, apiResponse);
done();
}
);
});
});

Expand Down Expand Up @@ -335,12 +343,13 @@ describe('Translate v2', () => {

it('should exec callback with languages', done => {
translate.getLanguages(
(err: Error, languages: {}, apiResponse_: {}) => {
assert.ifError(err);
assert.deepStrictEqual(languages, expectedResults);
assert.strictEqual(apiResponse_, apiResponse);
done();
});
(err: Error, languages: {}, apiResponse_: {}) => {
assert.ifError(err);
assert.deepStrictEqual(languages, expectedResults);
assert.strictEqual(apiResponse_, apiResponse);
done();
}
);
});
});
});
Expand Down Expand Up @@ -382,11 +391,13 @@ describe('Translate v2', () => {
};

translate.translate(
INPUT, {
from: SOURCE_LANG_CODE,
to: TARGET_LANG_CODE,
},
assert.ifError);
INPUT,
{
from: SOURCE_LANG_CODE,
to: TARGET_LANG_CODE,
},
assert.ifError
);
});
});

Expand Down Expand Up @@ -467,13 +478,15 @@ describe('Translate v2', () => {

it('should exec callback with error & API response', done => {
translate.translate(
INPUT, OPTIONS,
(err: Error, translations: {}, resp: r.Response) => {
assert.strictEqual(err, error);
assert.strictEqual(translations, null);
assert.strictEqual(resp, apiResponse);
done();
});
INPUT,
OPTIONS,
(err: Error, translations: {}, resp: r.Response) => {
assert.strictEqual(err, error);
assert.strictEqual(translations, null);
assert.strictEqual(resp, apiResponse);
done();
}
);
});
});

Expand All @@ -500,13 +513,15 @@ describe('Translate v2', () => {

it('should execute callback with results & API response', done => {
translate.translate(
INPUT, OPTIONS,
(err: Error, translations: {}, resp: r.Response) => {
assert.ifError(err);
assert.deepStrictEqual(translations, expectedResults);
assert.strictEqual(resp, apiResponse);
done();
});
INPUT,
OPTIONS,
(err: Error, translations: {}, resp: r.Response) => {
assert.ifError(err);
assert.deepStrictEqual(translations, expectedResults);
assert.strictEqual(resp, apiResponse);
done();
}
);
});

it('should execute callback with multiple results', done => {
Expand All @@ -520,11 +535,14 @@ describe('Translate v2', () => {

it('should return an array if input was an array', done => {
translate.translate(
[INPUT], OPTIONS, (err: Error, translations: {}) => {
assert.ifError(err);
assert.deepStrictEqual(translations, [expectedResults]);
done();
});
[INPUT],
OPTIONS,
(err: Error, translations: {}) => {
assert.ifError(err);
assert.deepStrictEqual(translations, [expectedResults]);
done();
}
);
});
});
});
Expand All @@ -550,11 +568,13 @@ describe('Translate v2', () => {
},
};

FakeService.prototype.request =
(reqOpts: r.Options, callback: Function) => {
assert.strictEqual(reqOpts, fakeOptions);
callback();
};
FakeService.prototype.request = (
reqOpts: r.Options,
callback: Function
) => {
assert.strictEqual(reqOpts, fakeOptions);
callback();
};

translate.request(fakeOptions, done);
});
Expand All @@ -573,7 +593,7 @@ describe('Translate v2', () => {
const userAgent = 'user-agent/0.0.0';

const getUserAgentFn = fakeUtil.getUserAgentFromPackageJson;
fakeUtil.getUserAgentFromPackageJson = (packageJson) => {
fakeUtil.getUserAgentFromPackageJson = packageJson => {
fakeUtil.getUserAgentFromPackageJson = getUserAgentFn;
assert.deepStrictEqual(packageJson, pkgJson);
return userAgent;
Expand All @@ -600,12 +620,15 @@ describe('Translate v2', () => {

expectedReqOpts.uri = translate.baseUrl + reqOpts.uri;

makeRequestOverride =
(reqOpts: r.Options, options: {}, callback: Function) => {
assert.deepStrictEqual(reqOpts, expectedReqOpts);
assert.strictEqual(options, translate.options);
callback(); // done()
};
makeRequestOverride = (
reqOpts: r.Options,
options: {},
callback: Function
) => {
assert.deepStrictEqual(reqOpts, expectedReqOpts);
assert.strictEqual(options, translate.options);
callback(); // done()
};

translate.request(reqOpts, done);
});
Expand Down

0 comments on commit bc9472b

Please sign in to comment.