botium-core 1.15.12 → 1.15.13

package/package.json

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

package/src/mocks/BotiumMockScripting.js

@@ -5,18 +5,21 @@ class BotiumMockAsserter {
     this.name = fromJson.name
     this.args = _.cloneDeep(fromJson.args)
     this.not = fromJson.not
+    this.resolvedArgs = fromJson.resolvedArgs || null
   }
 }
 class BotiumMockUserInput {
   constructor (fromJson = {}) {
     this.name = fromJson.name
     this.args = _.cloneDeep(fromJson.args)
+    this.resolvedArgs = fromJson.resolvedArgs || null
   }
 }
 class BotiumMockLogicHook {
   constructor (fromJson = {}) {
     this.name = fromJson.name
     this.args = _.cloneDeep(fromJson.args)
+    this.resolvedArgs = fromJson.resolvedArgs || null
   }
 }
 

package/src/scripting/Convo.js

@@ -703,6 +703,16 @@ class Convo {
         } finally {
           if (convoStep.sender !== 'begin' && convoStep.sender !== 'end' && !skipTranscriptStep) {
             transcriptStep.scriptingMemory = Object.assign({}, scriptingMemory)
+            if (container.caps[Capabilities.SCRIPTING_ENABLE_MEMORY] && transcriptStep.expected) {
+              const _resolveItemArgs = (items) => {
+                (items || []).forEach(item => {
+                  item.resolvedArgs = ScriptingMemory.applyToArgs(item.args, scriptingMemory, container.caps)
+                })
+              }
+              _resolveItemArgs(transcriptStep.expected.asserters)
+              _resolveItemArgs(transcriptStep.expected.logicHooks)
+              _resolveItemArgs(transcriptStep.expected.userInputs)
+            }
             transcriptStep.stepEnd = new Date()
             transcriptSteps.push(transcriptStep)
           }

package/test/scripting/logichooks/convos/scripting_memory_resolved_args.convo.txt

@@ -0,0 +1,11 @@
+scripting_memory_resolved_args
+
+#begin
+SET_SCRIPTING_MEMORY myword|hello
+
+#me
+say hello world
+
+#bot
+say hello world
+TEXT_CONTAINS_ANY $myword

package/test/scripting/logichooks/setClearScriptingMemory.spec.js

@@ -160,6 +160,20 @@ describe('scripting.logichooks.global.setClearScriptingMemory', function () {
         assert.isTrue(err.message.indexOf('no result from JSON-Path query') >= 0)
       }
     })
+
+    it('should populate resolvedArgs on transcript asserters', async function () {
+      this.compiler.ReadScript(path.resolve(__dirname, 'convos'), 'scripting_memory_resolved_args.convo.txt')
+      assert.equal(this.compiler.convos.length, 1)
+
+      const transcript = await this.compiler.convos[0].Run(this.container)
+      assert.equal(transcript.steps.length, 2)
+
+      const botStep = transcript.steps[1]
+      assert.isArray(botStep.expected.asserters)
+      assert.equal(botStep.expected.asserters.length, 1)
+      assert.deepEqual(botStep.expected.asserters[0].args, ['$myword'])
+      assert.deepEqual(botStep.expected.asserters[0].resolvedArgs, ['hello'])
+    })
   })
 
   describe('global', function () {