Merge branch 'Mikemosca-conv_329'

Author: nfriedly

.travis.yml

@@ -10,7 +10,7 @@ script:
 after_success:
 - jsdoc/publish.sh
 before_install:
-- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_d4f181ef7c79_key -iv $encrypted_d4f181ef7c79_iv -in auth.js.enc -out test/resources/auth.js -d || true'
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_cb4d3d070e32_key -iv $encrypted_cb4d3d070e32_iv -in auth.js.enc -out test/resources/auth.js -d || true'
 env:
   global:
     secure: I50FnfubwiZlol5Qs9tXPVACGbs+SG2dJLjpbzeio0Hl666d/hDuvf7IFwqqaRjQkmK2TdIjaGLMOgHxh/GGAoYf7LfZqjDID/tAhgoFOYiZwiPj66Z82F9P9cega2nkNW+125NzPuU3rhSCByG8+K/PMH/5JxPwPMoAYNLQjWc=

auth.js.enc

@@ -16,7 +16,14 @@ describe('conversation-v1', function() {
     password: 'bruce-wayne',
     url: 'http://ibm.com:80',
     version: 'v1',
-    version_date: '2016-05-19'
+    version_date: '2016-07-11'
+  };
+
+  var service1 = {
+    password: 'bruce-wayne',
+    url: 'http://ibm.com:80',
+    version: 'v1',
+    username: 'batman'
   };
 
   var payload = {
@@ -47,22 +54,45 @@ describe('conversation-v1', function() {
 
   describe('conversation()', function() {
     var reqPayload = {input:'foo',context:'rab'};
+    var reqPayload1 = {output:'foo',alternate_intents:true,entities:'1entity',intents:'1intent',junk:'junk'};
+    var reqPayload2 = {output:'foo',alternate_intents:true,entities:'1entity',intents:'1intent'};
     var params = extend({}, reqPayload, payload);
+    var params1 = extend({}, reqPayload1, payload);
+
+    it('should generate a valid payload', function() {
+        var req = conversation.message(params,noop);
+        var body = new Buffer(req.body).toString('ascii');
+        assert.equal(req.uri.href, service.url + paths.message + '?version=' + service.version_date);
+        assert.equal(req.method, 'POST');
+        assert.deepEqual(JSON.parse(body), reqPayload);
+      });
+
+    it('should generate a valid payload but parse out the junk option', function() {
+        var req = conversation.message(params1,noop);
+        var body = new Buffer(req.body).toString('ascii');
+        assert.equal(req.uri.href, service.url + paths.message + '?version=' + service.version_date);
+        assert.equal(req.method, 'POST');
+        assert.deepEqual(JSON.parse(body), reqPayload2);
+      });
 
-    it('should check no parameters provided', function() {
+    it('should check no parameters provided (negative test)', function() {
       conversation.message({}, missingParameter);
       conversation.message(null, missingParameter);
       conversation.message(undefined, missingParameter);
       conversation.message(pick(params,['workspace_id']), missingParameter);
+      conversation.message(pick(params,['input']), missingParameter);
     });
 
-    it('should generate a valid payload', function(done) {
-      var req = conversation.message(params,noop);
-      var body = new Buffer(req.body).toString('ascii');
-      assert.equal(req.uri.href, service.url + paths.message + '?version=' + service.version_date);
-      assert.equal(req.method, 'POST');
-      assert.deepEqual(JSON.parse(body), reqPayload);
-      done();
+    it('should generate version_date was not specified (negative test)', function() {
+      var threw = false;
+      try {
+        watson.conversation(service1);
+      }
+      catch(err) {
+        threw = true;
+        assert.equal(err.message, 'Argument error: version_date was not specified, use 2016-07-11');
+      }
+      assert(threw, "should throw an error")
     });
   });
 

test/test.conversation.v1.js

@@ -712,4 +712,28 @@ describe('integration-all-services', function() {
       });
     });
   });
+  
+  describe('functional_conversation', function() {
+    this.timeout(TEN_SECONDS);
+    var conversation = watson.conversation(auth.conversation);
+
+    it('message()', function(done) {
+      var params = {
+          input: {
+            text: 'Turn on the lights'
+          },
+          alternate_intents: true,
+          workspace_id: auth.conversation.workspace_id
+      };
+
+      conversation.message(params, function(err, result) {
+        if (err) {
+          return done(err);
+        }
+        assert.equal(result.alternate_intents, true);
+        done();
+      });
+    });
+  });
+  
 });