minor tweaks from PR feedback

callmehiphop · callmehiphop · commit 023359df6eef · 2016-11-11T12:44:33.000-05:00
diff --git a/packages/translate/README.md b/packages/translate/README.md
@@ -110,7 +110,7 @@ var translate = require('@google-cloud/translate')({
 It's also possible to authenticate with an API key. To create an API key:
 
 1. Visit the [Google Developers Console][dev-console].
-2. 2. Create a new project or click on an existing project.
+2. Create a new project or click on an existing project.
 3. Navigate to  **APIs & auth** > **APIs section** and turn on the following APIs (you may need to enable billing in order to use these services):
   * Google Translate API
 4. Navigate to **APIs & auth** >  **Credentials** and then click on **Create new Client ID** and select **API key**. You should then be presented with a pop-up containing your newly created key.
diff --git a/packages/translate/src/index.js b/packages/translate/src/index.js
@@ -310,11 +310,11 @@ Translate.prototype.getLanguages = function(target, callback) {
  *     not, we set the format as `text`.
  * @param {string} options.from - The ISO 639-1 language code the source input
  *     is written in.
+ * @param {string} options.model - **Note:** Users must be whitelisted to use
+ *     this parameter. Set the model type requested for this translation. Please
+ *     refer to the upstread documentation for possible values.
  * @param {string} options.to - The ISO 639-1 language code to translate the
  *     input to.
- * @param {string} options.model - **Note:** Users must be whitelisted to use
- *     this parameter. You can use this parameter to take advantage of Neural
- *     Machine Translation. Possible values are 'base' and 'nmt'.
  * @param {function} callback - The callback function.
  * @param {?error} callback.err - An error returned while making this request.
  * @param {object|object[]} callback.translations - If a single string input was
diff --git a/packages/translate/system-test/translate.js b/packages/translate/system-test/translate.js
@@ -23,6 +23,8 @@ var prop = require('propprop');
 var env = require('../../../system-test/env.js');
 var Translate = require('../');
 
+var API_KEY = process.env.GCLOUD_TESTS_API_KEY;
+
 describe('translate', function() {
   var translate = new Translate(extend({}, env));
 
@@ -145,4 +147,14 @@ describe('translate', function() {
       });
     });
   });
+
+  (API_KEY ? describe : describe.skip)('authentication', function() {
+    beforeEach(function() {
+      translate = new Translate({ key: API_KEY });
+    });
+
+    it('should use an API key to authenticate', function(done) {
+      translate.getLanguages(done);
+    });
+  });
 });
diff --git a/packages/translate/test/index.js b/packages/translate/test/index.js
@@ -17,13 +17,9 @@
 'use strict';
 
 var assert = require('assert');
-var common = require('@google-cloud/common');
 var extend = require('extend');
-var nodeutil = require('util');
 var proxyquire = require('proxyquire');
-
-var Service = common.Service;
-var util = common.util;
+var util = require('@google-cloud/common').util;
 
 var makeRequestOverride;
 var promisified = false;
@@ -44,11 +40,8 @@ var fakeUtil = extend({}, util, {
 
 function FakeService() {
   this.calledWith_ = arguments;
-  Service.apply(this, arguments);
 }
 
-nodeutil.inherits(FakeService, Service);
-
 describe('Translate', function() {
   var OPTIONS = {
     projectId: 'test-project'
@@ -98,7 +91,7 @@ describe('Translate', function() {
     });
 
     it('should inherit from Service', function() {
-      assert(translate instanceof Service);
+      assert(translate instanceof FakeService);
 
       var calledWith = translate.calledWith_[0];
       var baseUrl = 'https://translation.googleapis.com/language/translate/v2';
@@ -126,7 +119,7 @@ describe('Translate', function() {
       });
 
       it('should localize the api key', function() {
-        assert.equal(translate.key, KEY_OPTIONS.key);
+        assert.strictEqual(translate.key, KEY_OPTIONS.key);
       });
     });
 
@@ -144,7 +137,9 @@ describe('Translate', function() {
       });
 
       it('should correctly set the baseUrl', function() {
-        assert.strictEqual(translate.baseUrl, CUSTOM_ENDPOINT);
+        var baseUrl = translate.calledWith_[0].baseUrl;
+
+        assert.strictEqual(baseUrl, CUSTOM_ENDPOINT);
       });
 
       it('should remove trailing slashes', function() {
@@ -153,7 +148,9 @@ describe('Translate', function() {
         process.env.GOOGLE_CLOUD_TRANSLATE_ENDPOINT = 'http://localhost:8080//';
 
         var translate = new Translate(OPTIONS);
-        assert.strictEqual(translate.baseUrl, expectedBaseUrl);
+        var baseUrl = translate.calledWith_[0].baseUrl;
+
+        assert.strictEqual(baseUrl, expectedBaseUrl);
       });
     });
   });
