botium-core 1.15.8 → 1.15.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "botium-core",
-  "version": "1.15.8",
+  "version": "1.15.9",
   "description": "The Selenium for Chatbots",
   "main": "index.js",
   "module": "dist/botium-es.js",

package/src/BotDriver.js

@@ -241,8 +241,8 @@ module.exports = class BotDriver {
         if (_.isString(newCaps[capKey])) {
           try {
             caps[capKey] = JSON.parse(newCaps[capKey])
-            if (_.isFinite(caps[capKey])) {
-              caps[capKey] = caps[capKey].toString()
+            if (_.isFinite(Number(newCaps[capKey]))) {
+              caps[capKey] = newCaps[capKey].toString()
             }
           } catch (err) {
             caps[capKey] = newCaps[capKey]

package/src/scripting/ScriptingProvider.js

@@ -377,7 +377,15 @@ module.exports = class ScriptingProvider {
       throw Error(`Unknown hookType ${hookType}`)
     }
 
-    const localHooks = (logicHooks || []).filter(l => this.logicHooks[l.name][hookType])
+    let localHooks = (logicHooks || []).filter(l => this.logicHooks[l.name][hookType])
+    // Scripting memory file are injected via SET_SCRIPTING_MEMORY in the BEGIN step
+    // But there might be other logic hooks that need the scripting memory variables
+    // Order is important (SET_SCRIPTING_MEMORY in begin can be because the user added it,
+    // or because the scripting memory file added it. User one has to be the last one.
+    localHooks = [
+      ...localHooks.filter(l => l.name === 'SET_SCRIPTING_MEMORY'),
+      ...localHooks.filter(l => l.name !== 'SET_SCRIPTING_MEMORY')
+    ]
 
     const convoStepPromises = localHooks
       .map(l => p(this.retryHelperLogicHook, () => this.logicHooks[l.name][hookType]({
@@ -385,6 +393,7 @@ module.exports = class ScriptingProvider {
         convoStep,
         scriptingMemory,
         container,
+        // Do this more sensitve for SET_SCRIPTING_MEMORY? It can have scripting variables in the args
         args: ScriptingMemory.applyToArgs(l.args, scriptingMemory, container.caps, rest.botMsg),
         isGlobal: false,
         ...rest

package/test/driver/capabilities.spec.js

@@ -75,6 +75,15 @@ describe('driver.capabilities', function () {
       assert.isString(driver.caps.CAP_STRING_1)
       assert.isString(driver.caps.CAP_STRING_2)
     })
+    it('should merge string caps when there are numbers', function () {
+      const myCaps = {
+        CAP_STRING_1: 'Test',
+        CAP_STRING_2: '1234567892343434344'
+      }
+      const driver = new BotDriver(myCaps)
+      assert.strictEqual(driver.caps.CAP_STRING_1, myCaps.CAP_STRING_1)
+      assert.strictEqual(driver.caps.CAP_STRING_2, myCaps.CAP_STRING_2)
+    })
     it('should merge boolean envs', function () {
       process.env.BOTIUM_SIMPLEREST_PING_PROCESS_RESPONSE = 'NO'
       const driver = new BotDriver()