Merge branch 'master' into filter-by-tags-with-fields-param

salesforce · Jul 20, 2017 · c1b05ea · c1b05ea
2 parents 8cb8445 + 94a40ef
commit c1b05ea
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 2 deletions.
diff --git a/db/model/bot.js b/db/model/bot.js
@@ -50,6 +50,11 @@ module.exports = function bot(seq, dataTypes) {
       validate: { isUrl: true },
       comment: 'The URL to load bot',
     },
+    ui: {
+      type: dataTypes.BLOB,
+      allowNull: true,
+      comment: 'The packaged UI of the bot',
+    },
     active: {
       type: dataTypes.BOOLEAN,
       defaultValue: false,

diff --git a/tests/api/v1/bots/post.js b/tests/api/v1/bots/post.js
@@ -33,7 +33,7 @@ describe(`api: POST ${path}`, () => {
   });
 
   afterEach(u.forceDelete);
-  afterEach(tu.forceDeleteUser);
+  after(tu.forceDeleteToken);
 
   describe('POST bot', () => {
     it('Pass, post bot', (done) => {

diff --git a/tests/api/v1/bots/uiBlob b/tests/api/v1/bots/uiBlob
@@ -0,0 +1,6 @@
+<html>
+<body>
+</body>
+</html>
+<script>
+<script>
diff --git a/tests/api/v1/bots/utils.js b/tests/api/v1/bots/utils.js
@@ -11,15 +11,20 @@
  */
 'use strict';
 
+const path = require('path');
+const fs = require('fs');
 const tu = require('../../../testUtils');
 
 const testStartTime = new Date();
 const n = `${tu.namePrefix}TestBot`;
 const n2 = n+'NonActive';
+const mt = path.join(__dirname, './uiBlob');
+const uiBlob = fs.readFileSync(mt);
 
 const standard = {
   name: n,
   url: 'http://www.bar.com',
+  ui: uiBlob,
   active: true,
   actions: [
     {
@@ -92,6 +97,7 @@ const standard = {
 const nonActive = {
   name: n2,
   url: 'http://www.bar.com',
+  ui: uiBlob,
   active: false,
   actions: [
     {

diff --git a/tests/db/model/bot/uiBlob b/tests/db/model/bot/uiBlob
@@ -0,0 +1,6 @@
+<html>
+<body>
+</body>
+</html>
+<script>
+</script>
diff --git a/tests/db/model/bot/uiBlob2 b/tests/db/model/bot/uiBlob2
@@ -0,0 +1 @@
+0
diff --git a/tests/db/model/bot/update.js b/tests/db/model/bot/update.js
@@ -15,6 +15,10 @@ const expect = require('chai').expect;
 const tu = require('../../../testUtils');
 const u = require('./utils');
 const Bot = tu.db.Bot;
+const fs = require('fs');
+const path = require('path');
+const uiBlob = fs.readFileSync(path.join(__dirname, './uiBlob'));
+const uiBlob2 = fs.readFileSync(path.join(__dirname, './uiBlob2'));
 
 describe('db: bot: update: ', () => {
   beforeEach((done) => {
@@ -48,6 +52,20 @@ describe('db: bot: update: ', () => {
       .catch(done);
     });
 
+    it('ok, bot ui updated', (done) => {
+      Bot.findOne({ where: { name: u.name } })
+      .then((o) => {
+        expect(o.ui.length).to.equal(uiBlob.length);
+        return o.update({ ui: uiBlob2 });
+      })
+      .then(() => Bot.findOne({ where: { name: u.name } }))
+      .then((o) => {
+        expect(o.ui.length).to.equal(uiBlob2.length);
+        done();
+      })
+      .catch(done);
+    });
+
     it('fail, bot url bad', (done) => {
       Bot.findOne({ where: { name: u.name } })
       .then((o) => o.update({ url: 'noURL' }))

diff --git a/tests/db/model/bot/utils.js b/tests/db/model/bot/utils.js
@@ -10,16 +10,20 @@
  * tests/db/model/bot/utils.js
  */
 'use strict';
-
+const path = require('path');
+const fs = require('fs');
 const tu = require('../../../testUtils');
 
 const testStartTime = new Date();
 const n = `${tu.namePrefix}TestBot`;
 const n2 = n+'NonActive';
+const mt = path.join(__dirname, './uiBlob');
+const uiBlob = fs.readFileSync(mt);
 
 const standard = {
   name: n,
   url: 'http://www.bar.com',
+  ui: uiBlob,
   active: true,
   actions: [
     {
@@ -92,6 +96,7 @@ const standard = {
 const nonActive = {
   name: n2,
   url: 'http://www.bar.com',
+  ui: uiBlob,
   active: false,
   actions: [
     {