test: update tests for new auth.js format and remove detect faces tests (watson-developer-cloud#964)

Author: dpopp07

secrets.tar.enc

@@ -2,7 +2,6 @@
 
 const AssistantV1 = require('../../assistant/v1');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const assign = require('object.assign'); // for node v0.12 compatibility
 const serviceErrorUtils = require('../resources/service_error_util');
@@ -100,10 +99,16 @@ const test_dialog_node_update = 'updated_node';
 // changing language is forbidden starting with VERSION_DATE_2017_05_26
 const workspace1 = extend(true, {}, workspace, intents, { language: workspace.language });
 
+// extract service params from auth.js
+
 describe('assistant_integration', function() {
   jest.setTimeout(TEN_SECONDS);
-  auth.assistant.version = '2019-03-27';
-  const assistant = new AssistantV1(auth.assistant);
+  const auth = authHelper.auth.assistant;
+  const { workspaceId } = auth;
+
+  auth.version = '2019-03-27';
+  auth.iam_apikey = auth.apikey;
+  const assistant = new AssistantV1(auth);
 
   describe('message()', function() {
     it('alternate_intents with custom headers', function(done) {
@@ -112,7 +117,7 @@ describe('assistant_integration', function() {
           text: 'Turn on the lights',
         },
         alternate_intents: true,
-        workspace_id: auth.assistant.workspace_id,
+        workspace_id: workspaceId,
         headers: {
           customheader: 'custom',
         },
@@ -133,7 +138,7 @@ describe('assistant_integration', function() {
     });
 
     it('dialog_stack with 2017-02-03 version', function(done) {
-      const constructorParams = assign({}, auth.assistant, {
+      const constructorParams = assign({}, auth, {
         version: '2017-02-03',
       });
       const assistant = new AssistantV1(constructorParams);
@@ -142,7 +147,7 @@ describe('assistant_integration', function() {
         input: {
           text: 'Turn on the lights',
         },
-        workspace_id: auth.assistant.workspace_id,
+        workspace_id: workspaceId,
       };
 
       assistant.message(
@@ -160,7 +165,7 @@ describe('assistant_integration', function() {
     });
 
     it('dialog_stack with 2016-09-20 version', function(done) {
-      const constructorParams = assign({}, auth.assistant, {
+      const constructorParams = assign({}, auth, {
         version: '2016-09-20',
       });
       const assistant = new AssistantV1(constructorParams);
@@ -169,7 +174,7 @@ describe('assistant_integration', function() {
         input: {
           text: 'Turn on the lights',
         },
-        workspace_id: auth.assistant.workspace_id,
+        workspace_id: workspaceId,
       };
 
       assistant.message(
@@ -187,7 +192,7 @@ describe('assistant_integration', function() {
     });
 
     it('dialog_stack with 2016-07-11 version', function(done) {
-      const constructorParams = assign({}, auth.assistant, {
+      const constructorParams = assign({}, auth, {
         version: '2016-07-11',
       });
       const assistant = new AssistantV1(constructorParams);
@@ -196,7 +201,7 @@ describe('assistant_integration', function() {
         input: {
           text: 'Turn on the lights',
         },
-        workspace_id: auth.assistant.workspace_id,
+        workspace_id: workspaceId,
       };
 
       assistant.message(

test/integration/assistant.v1.test.js

@@ -2,14 +2,15 @@
 
 const AssistantV2 = require('../../assistant/v2');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const serviceErrorUtils = require('../resources/service_error_util');
 
 describe('assistant v2 integration', function() {
-  auth.assistant.version = '2019-03-27';
-  const assistant = new AssistantV2(auth.assistant);
-  const assistant_id = auth.assistant.assistant_id;
+  const auth = authHelper.auth.assistant;
+  auth.version = '2019-03-27';
+  auth.iam_apikey = auth.apikey;
+  const assistant = new AssistantV2(auth);
+  const assistant_id = auth.assistantId;
   let session_id;
 
   it('should createSession', function(done) {
@@ -95,7 +96,7 @@ describe('assistant v2 integration', function() {
     }
 
     const params = {
-      assistant_id: auth.assistant.assistant_id,
+      assistant_id,
       session_id,
     };
     assistant.deleteSession(

test/integration/assistant.v2.test.js

@@ -3,12 +3,13 @@
 const fs = require('fs');
 const CompareComply = require('../../compare-comply/v1');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const serviceErrorUtils = require('../resources/service_error_util');
 
 describe('compare_comply_integration', () => {
-  const compare_comply = new CompareComply(auth.compare_comply);
+  const auth = authHelper.auth.compare_comply;
+  auth.iam_apikey = auth.apikey;
+  const compare_comply = new CompareComply(auth);
   describe('html conversion @slow', () => {
     test('convertToHtml', done => {
       const params = {

test/integration/compare_comply.test.js

@@ -2,7 +2,6 @@
 
 const DiscoveryV1 = require('../../discovery/v1');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const async = require('async');
 const fs = require('fs');
@@ -14,14 +13,17 @@ const THIRTY_SECONDS = 30000;
 describe('discovery_integration', function() {
   jest.setTimeout(THIRTY_SECONDS);
 
-  const environment_id = auth.discovery.environment_id;
-  const configuration_id = auth.discovery.configuration_id;
-  const collection_id = auth.discovery.collection_id;
-  const collection_id2 = auth.discovery.collection_id_2;
-  const japanese_collection_id = auth.discovery.japanese_collection_id;
+  const auth = authHelper.auth.discovery;
+  const environment_id = auth.environmentId;
+  const configuration_id = auth.configurationId;
+  const collection_id = auth.collectionId;
+  const collection_id2 = auth.collectionId2;
+  const japanese_collection_id = auth.japaneseCollectionId;
+
+  auth.iam_apikey = auth.apikey;
 
   const discovery = new DiscoveryV1(
-    Object.assign({}, auth.discovery, {
+    Object.assign({}, auth, {
       version: '2019-03-27',
     })
   );

test/integration/discovery.test.js

@@ -3,7 +3,6 @@
 const fs = require('fs');
 const LanguageTranslatorV3 = require('../../language-translator/v3');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const TWENTY_SECONDS = 20000;
 const serviceErrorUtils = require('../resources/service_error_util');
@@ -12,8 +11,10 @@ const serviceErrorUtils = require('../resources/service_error_util');
 describe('language_translator_integration', function() {
   jest.setTimeout(TWENTY_SECONDS * 2);
 
-  auth.language_translator.version = '2019-03-27';
-  const language_translator = new LanguageTranslatorV3(auth.language_translator);
+  const auth = authHelper.auth.language_translator;
+  auth.version = '2019-03-27';
+  auth.iam_apikey = auth.apikey;
+  const language_translator = new LanguageTranslatorV3(auth);
 
   it('listModels()', function(done) {
     language_translator.listModels(null, serviceErrorUtils.checkErrorCode(200, done));

test/integration/language_translator.v3.test.js

@@ -2,21 +2,22 @@
 
 const NaturalLanguageClassifierV1 = require('../../natural-language-classifier/v1');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const TWENTY_SECONDS = 20000;
 const serviceErrorUtils = require('../resources/service_error_util');
 
 describe('natural_language_classifier_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
-  const natural_language_classifier = new NaturalLanguageClassifierV1(
-    auth.natural_language_classifier
-  );
+  const auth = authHelper.auth.natural_language_classifier;
+  auth.iam_apikey = auth.apikey;
+  const natural_language_classifier = new NaturalLanguageClassifierV1(auth);
+
+  const classifier_id = auth.classifierId;
 
   it('getClassifier', function(done) {
     const params = {
-      classifier_id: auth.natural_language_classifier.classifier_id,
+      classifier_id,
     };
     natural_language_classifier.getClassifier(
       params,
@@ -29,7 +30,7 @@ describe('natural_language_classifier_integration', function() {
 
   it('classifyCollection', function(done) {
     const params = {
-      classifier_id: auth.natural_language_classifier.classifier_id,
+      classifier_id,
       collection: [{ text: 'string' }],
     };
     natural_language_classifier.classifyCollection(

test/integration/natural_language_classifier.test.js

@@ -4,7 +4,6 @@ const fs = require('fs');
 const PersonalityInsightsV3 = require('../../personality-insights/v3');
 const path = require('path');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const TWENTY_SECONDS = 20000;
 const serviceErrorUtils = require('../resources/service_error_util');
@@ -13,8 +12,10 @@ describe('personality_insights_v3_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
   const mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
-  auth.personality_insights.version = '2019-03-27';
-  const personality_insights = new PersonalityInsightsV3(auth.personality_insights);
+  const auth = authHelper.auth.personality_insights;
+  auth.version = '2019-03-27';
+  auth.iam_apikey = auth.apikey;
+  const personality_insights = new PersonalityInsightsV3(auth);
 
   it('profile with text content', function(done) {
     const params = {

test/integration/personality_insights.v3.test.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const SpeechToTextV1 = require('../../speech-to-text/v1');
 const fs = require('fs');
@@ -16,7 +15,9 @@ const TWO_MINUTES = 2 * 60 * 1000;
 describe('speech_to_text_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
-  const speech_to_text = new SpeechToTextV1(auth.speech_to_text);
+  const auth = authHelper.auth.speech_to_text;
+  auth.iam_apikey = auth.apikey;
+  const speech_to_text = new SpeechToTextV1(auth);
 
   it('recognize()', function(done) {
     const params = {
@@ -109,8 +110,8 @@ describe('speech_to_text_integration', function() {
     });
 
     it('transcribes audio over a websocket, credentials from environment', function(done) {
-      process.env.SPEECH_TO_TEXT_IAM_APIKEY = auth.speech_to_text.iam_apikey;
-      process.env.SPEECH_TO_TEXT_URL = auth.speech_to_text.url;
+      process.env.SPEECH_TO_TEXT_IAM_APIKEY = auth.apikey;
+      process.env.SPEECH_TO_TEXT_URL = auth.url;
       const speech_to_text_env = new SpeechToTextV1({});
       const recognizeStream = speech_to_text_env.recognizeUsingWebSocket();
       recognizeStream.setEncoding('utf8');
@@ -133,8 +134,8 @@ describe('speech_to_text_integration', function() {
         speech_to_text: [
           {
             credentials: {
-              iam_apikey: auth.speech_to_text.iam_apikey,
-              url: auth.speech_to_text.url,
+              iam_apikey: auth.apikey,
+              url: auth.url,
             },
           },
         ],
@@ -211,7 +212,7 @@ describe('speech_to_text_integration', function() {
     }
 
     beforeAll(function(done) {
-      const speech_to_text = new SpeechToTextV1(auth.speech_to_text);
+      const speech_to_text = new SpeechToTextV1(auth);
       speech_to_text.listLanguageModels({}, function(err, result) {
         if (err) {
           // eslint-disable-next-line no-console

test/integration/speech_to_text.test.js

@@ -3,15 +3,16 @@
 const TextToSpeechV1 = require('../../text-to-speech/v1');
 const wav = require('wav');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const TWENTY_SECONDS = 20000;
 const serviceErrorUtils = require('../resources/service_error_util');
 
 describe('text_to_speech_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
-  const text_to_speech = new TextToSpeechV1(auth.text_to_speech);
+  const auth = authHelper.auth.text_to_speech;
+  auth.iam_apikey = auth.apikey;
+  const text_to_speech = new TextToSpeechV1(auth);
 
   it('listVoices()', function(done) {
     text_to_speech.listVoices(null, serviceErrorUtils.checkErrorCode(200, done));

test/integration/text_to_speech.test.js

@@ -4,16 +4,17 @@ const fs = require('fs');
 const ToneAnalyzerV3 = require('../../tone-analyzer/v3');
 const path = require('path');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const TWENTY_SECONDS = 20000;
 const serviceErrorUtils = require('../resources/service_error_util');
 
 describe('tone_analyzer_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
-  auth.tone_analyzer.version = '2019-03-27';
-  const tone_analyzer = new ToneAnalyzerV3(auth.tone_analyzer);
+  const auth = authHelper.auth.tone_analyzer;
+  auth.version = '2019-03-27';
+  auth.iam_apikey = auth.apikey;
+  const tone_analyzer = new ToneAnalyzerV3(auth);
 
   it('tone()', function(done) {
     const mobydick = fs.readFileSync(path.join(__dirname, '../resources/tweet.txt'), 'utf8');

test/integration/tone_analyzer.test.js

@@ -3,7 +3,6 @@ const fs = require('fs');
 const VisualRecognitionV3 = require('../../visual-recognition/v3');
 const path = require('path');
 const authHelper = require('../resources/auth_helper.js');
-const auth = authHelper.auth;
 const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :)
 const async = require('async');
 
@@ -18,8 +17,11 @@ describe.skip('visual_recognition_integration_custom_classifiers @slow', functio
   // ugh.
   jest.setTimeout(THIRTY_SECONDS * 8);
 
+  const auth = authHelper.auth.visual_recognition;
+  auth.iam_apikey = auth.apikey;
+
   const visual_recognition = new VisualRecognitionV3(
-    Object.assign({}, auth.visual_recognition_rc.v3, {
+    Object.assign({}, auth, {
       version: '2019-03-27',
     })
   );