ci(travis): update authentication (watson-developer-cloud#705)

* ci(travis): update authentication * test(visual recognition): changed cf/rc url integration test to be a unit test
rrberry · May 31, 2018 · 7305fea · 7305fea
1 parent ee5273f
commit 7305fea
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 36 deletions.
diff --git a/auth.js.enc b/auth.js.enc
diff --git a/test/integration/test.visual_recognition.js b/test/integration/test.visual_recognition.js
@@ -17,48 +17,20 @@ describe('visual_recognition_integration', function() {
   this.retries(5);
 
   let visual_recognition;
-  let visual_recognition_rc;
-  let visual_recognition_url;
 
   before(function() {
     visual_recognition = new watson.VisualRecognitionV3(
       Object.assign({}, auth.visual_recognition.v3, {
         version: watson.VisualRecognitionV3.VERSION_DATE_2016_05_20,
       })
     );
-    visual_recognition_url = new watson.VisualRecognitionV3(
-      Object.assign({}, auth.visual_recognition.v3, {
-        version: watson.VisualRecognitionV3.VERSION_DATE_2016_05_20,
-        url: 'hello.com',
-      })
-    );
-    visual_recognition_rc = new watson.VisualRecognitionV3(
-      Object.assign({}, auth.visual_recognition_rc.v3, {
-        version: watson.VisualRecognitionV3.VERSION_DATE_2016_05_20,
-      })
-    );
     nock.enableNetConnect();
   });
 
   after(function() {
     nock.disableNetConnect();
   });
 
-  describe('authentication urls', function() {
-    it('should have the correct URL depending on rc/cf', function(done) {
-      assert.equal(
-        visual_recognition._options.url,
-        'https://gateway-a.watsonplatform.net/visual-recognition/api'
-      );
-      assert.equal(
-        visual_recognition_rc._options.url,
-        'https://gateway.watsonplatform.net/visual-recognition/api'
-      );
-      assert.equal(visual_recognition_url._options.url, 'hello.com');
-      done();
-    });
-  });
-
   describe('classify()', function() {
     it('should classify an uploaded image', function(done) {
       const params = {

diff --git a/test/unit/test.visual_recognition.v3.js b/test/unit/test.visual_recognition.v3.js
@@ -523,8 +523,35 @@ describe('visual_recognition', function() {
     });
   });
 
-  describe('Credentials', function() {
-    it('should load its credentials from bluemix (VR)', function() {
+  describe('RC and CF urls', function() {
+    it('should have the correct URL depending on rc/cf', function(done) {
+      const visual_recognition_cf = new watson.VisualRecognitionV3({
+        api_key: 'apikey',
+        version: '2018-03-19',
+      });
+      const visual_recognition_rc = new watson.VisualRecognitionV3({
+        iam_apikey: 'iam_apikey',
+        version: '2018-03-19',
+      });
+      const visual_recognition_url = new watson.VisualRecognitionV3({
+        api_key: 'apikey',
+        url: 'hello.com',
+        version: '2018-03-19',
+      });
+
+      assert.equal(
+        visual_recognition_cf._options.url,
+        'https://gateway-a.watsonplatform.net/visual-recognition/api'
+      );
+      assert.equal(
+        visual_recognition_rc._options.url,
+        'https://gateway.watsonplatform.net/visual-recognition/api'
+      );
+      assert.equal(visual_recognition_url._options.url, 'hello.com');
+      done();
+    });
+
+    it('should load its credentials from bluemix (VR) with correct url', function() {
       process.env.VCAP_SERVICES = JSON.stringify({
         watson_vision_combined: [
           {
@@ -534,24 +561,24 @@ describe('visual_recognition', function() {
           },
         ],
       });
-      const visual_recognition_cf = new watson.VisualRecognitionV3({
+      const visual_recognition_bluemix = new watson.VisualRecognitionV3({
         version: '2018-03-19',
       });
-      assert(visual_recognition_cf);
+      assert(visual_recognition_bluemix);
       assert.equal(
-        visual_recognition_cf.getCredentials().url,
+        visual_recognition_bluemix.getCredentials().url,
         'https://gateway-a.watsonplatform.net/visual-recognition/api'
       );
     });
 
     it('should load its credentials from environment (VR)', function() {
       process.env.VISUAL_RECOGNITION_API_KEY = 'key';
-      const visual_recognition_cf = new watson.VisualRecognitionV3({
+      const visual_recognition_env = new watson.VisualRecognitionV3({
         version: '2018-03-19',
       });
-      assert(visual_recognition_cf);
+      assert(visual_recognition_env);
       assert.equal(
-        visual_recognition_cf.getCredentials().url,
+        visual_recognition_env.getCredentials().url,
         'https://gateway-a.watsonplatform.net/visual-recognition/api'
       );
     });