Merge pull request #631 from codeforequity-at/develop

Botium Core 1.11.4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "botium-core",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "description": "The Selenium for Chatbots",
   "main": "index.js",
   "module": "dist/botium-es.js",
@@ -67,7 +67,7 @@
     "uuid": "^8.3.2",
     "vm2": "^3.9.3",
     "write-yaml": "^1.0.0",
-    "xlsx": "^0.16.9",
+    "xlsx": "^0.17.0",
     "xregexp": "^5.0.2",
     "yaml": "^1.10.2"
   },

src/scripting/CompilerXlsx.js

@@ -41,6 +41,7 @@ module.exports = class CompilerXlsx extends CompilerBase {
     const workbook = XLSX.read(scriptBuffer, { type: 'buffer' })
     if (!workbook) throw new Error('Workbook not readable')
 
+    debug(`Loaded XLSX with Props: ${workbook.Props ? JSON.stringify(workbook.Props) : '<none>'}`)
     const eol = this.caps[Capabilities.SCRIPTING_XLSX_EOL_WRITE]
     const maxEmptyRowCount = 10
 
@@ -278,7 +279,7 @@ module.exports = class CompilerXlsx extends CompilerBase {
           }
           rowindex++
 
-          if (emptylines > 1) break
+          if (emptylines > maxEmptyRowCount) break
         }
       }
 

test/compiler/compilerxlsx.spec.js

@@ -99,6 +99,23 @@ describe('compiler.compilerxlsx', function () {
       assert.equal(context.utterances[0].name, 'TESTUTT1')
       assert.equal(context.utterances[1].name, 'TESTUTT2')
     })
+    it('should read 2 utterances separated by empty lines', async function () {
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_2utterances_emptylines.xlsx'))
+      const context = buildContext()
+
+      const caps = {
+        SCRIPTING_XLSX_SHEETNAMES_UTTERANCES: 'Utterances'
+      }
+      const compiler = new Compiler(context, Object.assign({}, DefaultCapabilities, caps))
+
+      compiler.Compile(scriptBuffer, 'SCRIPTING_TYPE_UTTERANCES')
+      assert.lengthOf(context.convos, 0)
+      assert.lengthOf(context.utterances, 2)
+      assert.equal(context.utterances[0].name, 'TESTUTT1')
+      assert.equal(context.utterances[0].utterances.length, 2)
+      assert.equal(context.utterances[1].name, 'TESTUTT2')
+      assert.equal(context.utterances[1].utterances.length, 3)
+    })
     it('should read 2 convos from given region by letter', async function () {
       const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_2convos_middle.xlsx'))
       const context = buildContext()