Change version_date to version in tests (except adapter tests).

Author: Mike Kistler

test/integration/test.adapter.conversation.js

@@ -7,7 +7,6 @@ const authHelper = require('./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 ConversationV1 = require('../../conversation/v1');
 
 const extend = require('extend');
 
@@ -102,16 +101,19 @@ 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 });
 
-describe('conversation_integration', function() {
+describe('conversation_adapter_integration', function() {
   this.timeout(TEN_SECONDS);
   this.slow(TWO_SECONDS); // this controls when the tests get a colored warning for taking too long
   // this.retries(1);
 
   let conversation;
 
   before(function() {
-    auth.conversation.version_date = ConversationV1.VERSION_DATE_2017_05_26;
-    conversation = watson.conversation(auth.conversation);
+    const constructorParams = assign({}, auth.conversation, {
+      version: 'v1',
+      version_date: '2017-05-26'
+    });
+    conversation = watson.conversation(constructorParams);
     nock.enableNetConnect();
   });
 
@@ -140,7 +142,8 @@ describe('conversation_integration', function() {
 
     it('dialog_stack with 2017-02-03 version_date', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2017_02_03
+        version: 'v1',
+        version_date: '2017-02-03'
       });
       const conversation = watson.conversation(constructorParams);
 
@@ -162,7 +165,8 @@ describe('conversation_integration', function() {
 
     it('dialog_stack with 2016-09-20 version_date', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2016_09_20
+        version: 'v1',
+        version_date: '2016-09-20'
       });
       const conversation = watson.conversation(constructorParams);
 
@@ -184,7 +188,8 @@ describe('conversation_integration', function() {
 
     it('dialog_stack with 2016-07-11 version_date', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2016_07_11
+        version: 'v1',
+        version_date: '2016-07-11'
       });
       const conversation = watson.conversation(constructorParams);
 

test/integration/test.adapter.personality_insights.v3.js

@@ -10,7 +10,7 @@ const describe = authHelper.describe; // this runs describe.skip if there is no
 const TWENTY_SECONDS = 20000;
 const TWO_SECONDS = 2000;
 
-describe('personality_insights_v3_integration', function() {
+describe('personality_insights_v3_adapter_integration', function() {
   this.retries(1);
 
   this.slow(TWO_SECONDS); // this controls when the tests get a colored warning for taking too long
@@ -20,6 +20,8 @@ describe('personality_insights_v3_integration', function() {
 
   before(function() {
     mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
+    auth.personality_insights.v3.version = 'v3';
+    auth.personality_insights.v3.version_date = '2016-10-19';
     personality_insights = watson.personality_insights(auth.personality_insights.v3);
     nock.enableNetConnect();
   });

test/integration/test.adapter.tone_analyzer.js

@@ -10,14 +10,16 @@ const describe = authHelper.describe; // this runs describe.skip if there is no
 const TWENTY_SECONDS = 20000;
 const TWO_SECONDS = 2000;
 
-describe('tone_analyzer_integration', function() {
+describe('tone_analyzer_adapter_integration', function() {
   this.timeout(TWENTY_SECONDS);
   this.slow(TWO_SECONDS); // this controls when the tests get a colored warning for taking too long
   this.retries(1);
 
   let tone_analyzer;
 
   before(function() {
+    auth.tone_analyzer.version = 'v3';
+    auth.tone_analyzer.version_date = '2016-06-19';
     tone_analyzer = watson.tone_analyzer(auth.tone_analyzer);
     nock.enableNetConnect();
   });

test/integration/test.conversation.js

@@ -111,8 +111,8 @@ describe('conversation_integration', function() {
   let conversation;
 
   before(function() {
-    auth.conversation.version_date = '2017-05-26';
-    conversation = watson.conversation(auth.conversation);
+    auth.conversation.version = '2017-05-26';
+    conversation = new watson.ConversationV1(auth.conversation);
     nock.enableNetConnect();
   });
 
@@ -139,11 +139,11 @@ describe('conversation_integration', function() {
       });
     });
 
-    it('dialog_stack with 2017-02-03 version_date', function(done) {
+    it('dialog_stack with 2017-02-03 version', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2017_02_03
+        version: ConversationV1.VERSION_DATE_2017_02_03
       });
-      const conversation = watson.conversation(constructorParams);
+      const conversation = new watson.ConversationV1(constructorParams);
 
       const params = {
         input: {
@@ -161,11 +161,11 @@ describe('conversation_integration', function() {
       });
     });
 
-    it('dialog_stack with 2016-09-20 version_date', function(done) {
+    it('dialog_stack with 2016-09-20 version', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2016_09_20
+        version: ConversationV1.VERSION_DATE_2016_09_20
       });
-      const conversation = watson.conversation(constructorParams);
+      const conversation = new watson.ConversationV1(constructorParams);
 
       const params = {
         input: {
@@ -183,11 +183,11 @@ describe('conversation_integration', function() {
       });
     });
 
-    it('dialog_stack with 2016-07-11 version_date', function(done) {
+    it('dialog_stack with 2016-07-11 version', function(done) {
       const constructorParams = assign({}, auth.conversation, {
-        version_date: ConversationV1.VERSION_DATE_2016_07_11
+        version: ConversationV1.VERSION_DATE_2016_07_11
       });
-      const conversation = watson.conversation(constructorParams);
+      const conversation = new watson.ConversationV1(constructorParams);
 
       const params = {
         input: {

test/integration/test.dialog.js

@@ -19,6 +19,7 @@ describe('dialog_integration', function() {
   const client_id = 31;
 
   before(function() {
+    auth.dialog.version = 'v1';
     dialog = watson.dialog(auth.dialog);
     dialog_id = auth.dialog.dialog_id;
     nock.enableNetConnect();

test/integration/test.discovery.js

@@ -26,7 +26,7 @@ describe.skip('discovery_integration', function() {
     nock.enableNetConnect();
     discovery = new DiscoveryV1(
       Object.assign({}, auth.discovery, {
-        version_date: DiscoveryV1.VERSION_DATE_2017_04_27
+        version: DiscoveryV1.VERSION_DATE_2017_04_27
       })
     );
     environment_id = auth.discovery.environment_id;

test/integration/test.personality_insights.v2.js

@@ -20,6 +20,7 @@ describe('personality_insights_v2_integration', function() {
 
   before(function() {
     mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
+    auth.personality_insights.v2.version = 'v2';
     personality_insights = watson.personality_insights(auth.personality_insights.v2);
     nock.enableNetConnect();
   });

test/integration/test.personality_insights.v3.js

@@ -20,7 +20,8 @@ describe('personality_insights_v3_integration', function() {
 
   before(function() {
     mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
-    personality_insights = watson.personality_insights(auth.personality_insights.v3);
+    auth.personality_insights.v3.version = '2016-10-19';
+    personality_insights = new watson.PersonalityInsightsV3(auth.personality_insights.v3);
     nock.enableNetConnect();
   });
 

test/integration/test.text_to_speech.js

@@ -17,7 +17,7 @@ describe('text_to_speech_integration', function() {
   let text_to_speech;
 
   before(function() {
-    text_to_speech = watson.text_to_speech(auth.text_to_speech);
+    text_to_speech = new watson.TextToSpeechV1(auth.text_to_speech);
     nock.enableNetConnect();
   });
 

test/integration/test.tone_analyzer.js

@@ -19,7 +19,8 @@ describe('tone_analyzer_integration', function() {
   let tone_analyzer;
 
   before(function() {
-    tone_analyzer = watson.tone_analyzer(auth.tone_analyzer);
+    auth.tone_analyzer.version = '2016-06-19';
+    tone_analyzer = new watson.ToneAnalyzerV3(auth.tone_analyzer);
     nock.enableNetConnect();
   });