all modules: ensure all User-Agents are set (#1568)

googleapis · Sep 9, 2016 · 8d55dde · 8d55dde
1 parent 1a14c89
commit 8d55dde
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/packages/google-cloud-translate/package.json b/packages/google-cloud-translate/package.json
@@ -50,7 +50,7 @@
  "translate"
  ],
  "dependencies": {
- "@google-cloud/common": "^0.2.0",
+ "@google-cloud/common": "^0.5.0",
  "arrify": "^1.0.0",
  "extend": "^3.0.0",
  "is": "^3.0.1",

diff --git a/packages/google-cloud-translate/src/index.js b/packages/google-cloud-translate/src/index.js
@@ -384,7 +384,7 @@ Translate.prototype.request = function(reqOpts, callback) {
  key: this.key
  },
  headers: {
- 'User-Agent': PKG.name + '/' + PKG.version
+ 'User-Agent': common.util.getUserAgentFromPackageJson(PKG)
  }
  });
 

diff --git a/packages/google-cloud-translate/test/index.js b/packages/google-cloud-translate/test/index.js
@@ -21,8 +21,6 @@ var extend = require('extend');
 var proxyquire = require('proxyquire');
 var util = require('@google-cloud/common').util;
 
-var PKG = require('../package.json');
-
 var makeRequestOverride;
 var fakeUtil = extend({}, util, {
  makeRequest: function() {
@@ -386,6 +384,15 @@ describe('Translate', function() {
 
  describe('request', function() {
  it('should make the correct request', function(done) {
+ var userAgent = 'user-agent/0.0.0';
+
+ var getUserAgentFn = fakeUtil.getUserAgentFromPackageJson;
+ fakeUtil.getUserAgentFromPackageJson = function(packageJson) {
+ fakeUtil.getUserAgentFromPackageJson = getUserAgentFn;
+ assert.deepEqual(packageJson, require('../package.json'));
+ return userAgent;
+ };
+
  var reqOpts = {
  uri: '/test',
  a: 'b',
@@ -401,7 +408,7 @@ describe('Translate', function() {
  key: translate.key
  },
  headers: {
- 'User-Agent': PKG.name + '/' + PKG.version
+ 'User-Agent': userAgent
  }
  });
  var BASE_URL = 'https://www.googleapis.com/language/translate/v2';