Merge branch 'master' into handle-bad-chars-in-urls-creds

Author: dpopp07

.travis.yml

@@ -4,17 +4,16 @@ node_js:
 - 6
 - 8
 before_install:
-- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_ac3aacad7ba8_key -iv $encrypted_ac3aacad7ba8_iv
-  -in secrets.tar.enc -out test/resources/secrets.tar -d || true'
-- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && cd test/resources/ && tar xvf secrets.tar && cd ../.. || true'
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_ac3aacad7ba8_key
+  -iv $encrypted_ac3aacad7ba8_iv -in secrets.tar.enc -out test/resources/secrets.tar
+  -d || true'
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && cd test/resources/ && tar xvf secrets.tar
+  && cd ../.. || true'
 - npm install -g typescript
 script:
 - tsc
-- if [ "${TRAVIS_PULL_REQUEST}" = "false" ];
-    then npm run test-travis;
-  else
-    npm run test-unit-travis;
-  fi
+- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then npm run test-travis; else npm run
+  test-unit-travis; fi
 - sh scripts/typedoc/generate_typedoc.sh
 after_success:
 - npm run report-coverage

assistant/v1.ts

@@ -3715,6 +3715,8 @@ namespace AssistantV1 {
     digress_out_slots?: string;
     /** A label that can be displayed externally to describe the purpose of the node to users. This string must be no longer than 512 characters. */
     user_label?: string;
+    /** Whether to consider the dialog node during runtime evaluation.  Set to `true` to ignore the dialog node. */
+    disabled?: boolean;
   }
 
   /** CreateEntity. */

assistant/v2.ts

@@ -452,6 +452,8 @@ namespace AssistantV2 {
     actions?: DialogNodeAction[];
     /** Additional detailed information about a message response and how it was generated. */
     debug?: MessageOutputDebug;
+    /** An object containing any custom properties included in the response. This object includes any arbitrary properties defined in the dialog JSON editor as part of the dialog node output. */
+    user_defined?: Object;
   }
 
   /** Additional detailed information about a message response and how it was generated. */

examples/personality_insights.v2.js

@@ -11,9 +11,9 @@ const TWENTY_SECONDS = 20000;
 describe('personality_insights_v3_adapter_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
   const 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';
-  const personality_insights = watson.personality_insights(auth.personality_insights.v3);
+  auth.personality_insights.version = 'v3';
+  auth.personality_insights.version_date = '2016-10-19';
+  const personality_insights = watson.personality_insights(auth.personality_insights);
 
   it('profile()', function(done) {
     const params = {

secrets.tar.enc

@@ -12,8 +12,8 @@ describe('personality_insights_v3_integration', function() {
   jest.setTimeout(TWENTY_SECONDS);
 
   const mobydick = fs.readFileSync(path.join(__dirname, '../resources/mobydick.txt'), 'utf8');
-  auth.personality_insights.v3.version = '2016-10-19';
-  const personality_insights = new watson.PersonalityInsightsV3(auth.personality_insights.v3);
+  auth.personality_insights.version = '2016-10-19';
+  const personality_insights = new watson.PersonalityInsightsV3(auth.personality_insights);
 
   it('profile with text content', function(done) {
     const params = {