botium-core 1.13.12 → 1.13.14

package/index.js

@@ -1,21 +1,27 @@
 module.exports = {
   BotDriver: require('./src/BotDriver'),
-  ScriptingProvider: require('./src/scripting/ScriptingProvider'),
-  ScriptingConstants: require('./src/scripting/Constants'),
   Capabilities: require('./src/Capabilities'),
   Defaults: require('./src/Defaults'),
   Enums: require('./src/Enums'),
-  Source: require('./src/Source'),
   Events: require('./src/Events'),
   Plugins: require('./src/Plugins'),
+  Source: require('./src/Source'),
+
+  InboundProxy: require('./src/grid/inbound/proxy'),
+
+  HookUtils: require('./src/helpers/HookUtils'),
+  TranscriptUtils: require('./src/helpers/TranscriptUtils'),
+
+  BotiumMockRichMessageTypes: require('./src/mocks/BotiumMockRichMessageTypes'),
+
   BotiumError: require('./src/scripting/BotiumError').BotiumError,
+  ScriptingConstants: require('./src/scripting/Constants'),
   ScriptingMemory: require('./src/scripting/ScriptingMemory'),
-  HookUtils: require('./src/helpers/HookUtils'),
+  ScriptingProvider: require('./src/scripting/ScriptingProvider'),
   LogicHookConstants: require('./src/scripting/logichook/LogicHookConsts'),
+
   Lib: {
-    tryLoadPlugin: require('./src/containers/plugins/index').tryLoadPlugin,
-    SimpleRestContainer: require('./src/containers/plugins/SimpleRestContainer')
-  },
-  InboundProxy: require('./src/grid/inbound/proxy'),
-  BotiumMockRichMessageTypes: require('./src/mocks/BotiumMockRichMessageTypes')
+    SimpleRestContainer: require('./src/containers/plugins/SimpleRestContainer'),
+    tryLoadPlugin: require('./src/containers/plugins/index').tryLoadPlugin
+  }
 }

package/package.json

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

package/src/Capabilities.js

@@ -73,10 +73,14 @@ module.exports = {
   SIMPLEREST_RESPONSE_HOOK: 'SIMPLEREST_RESPONSE_HOOK',
   SIMPLEREST_MEDIA_JSONPATH: 'SIMPLEREST_MEDIA_JSONPATH',
   SIMPLEREST_BUTTONS_JSONPATH: 'SIMPLEREST_BUTTONS_JSONPATH',
+  SIMPLEREST_BUTTONS_TEXT_SUBJSONPATH: 'SIMPLEREST_BUTTONS_TEXT_SUBJSONPATH',
+  SIMPLEREST_BUTTONS_PAYLOAD_SUBJSONPATH: 'SIMPLEREST_BUTTONS_PAYLOAD_SUBJSONPATH',
   SIMPLEREST_CARDS_JSONPATH: 'SIMPLEREST_CARDS_JSONPATH',
   SIMPLEREST_CARD_TEXT_JSONPATH: 'SIMPLEREST_CARD_TEXT_JSONPATH',
   SIMPLEREST_CARD_SUBTEXT_JSONPATH: 'SIMPLEREST_CARD_SUBTEXT_JSONPATH',
   SIMPLEREST_CARD_BUTTONS_JSONPATH: 'SIMPLEREST_CARD_BUTTONS_JSONPATH',
+  SIMPLEREST_CARD_BUTTONS_TEXT_SUBJSONPATH: 'SIMPLEREST_CARD_BUTTONS_TEXT_SUBJSONPATH',
+  SIMPLEREST_CARD_BUTTONS_PAYLOAD_SUBJSONPATH: 'SIMPLEREST_CARD_BUTTONS_PAYLOAD_SUBJSONPATH',
   SIMPLEREST_CARD_ATTACHMENTS_JSONPATH: 'SIMPLEREST_CARD_ATTACHMENTS_JSONPATH',
   SIMPLEREST_CONTEXT_JSONPATH: 'SIMPLEREST_CONTEXT_JSONPATH',
   SIMPLEREST_CONTEXT_MERGE_OR_REPLACE: 'SIMPLEREST_CONTEXT_MERGE_OR_REPLACE',

package/src/containers/plugins/SimpleRestContainer.js

@@ -228,6 +228,7 @@ module.exports = class SimpleRestContainer {
     await this._unsubscribeInbound()
     await this._stopPolling()
     this.view = {}
+    this.cookies = {}
   }
 
   Clean () {
@@ -294,18 +295,24 @@ module.exports = class SimpleRestContainer {
 
     const result = []
     if (isFromUser) {
-      const jsonPathRoots = []
-
-      const jsonPathsBody = getAllCapValues(Capabilities.SIMPLEREST_BODY_JSONPATH, this.caps)
-      if (jsonPathsBody.length > 0) {
-        for (const jsonPathBody of jsonPathsBody) {
-          const rb = jp.query(body, jsonPathBody)
+      const _extractFrom = (root, jsonPaths) => {
+        const flattened = []
+        for (const jsonPath of jsonPaths) {
+          const rb = jp.query(root, jsonPath)
           if (_.isArray(rb)) {
-            rb.forEach(r => jsonPathRoots.push(r))
+            _.flattenDeep(rb).forEach(r => flattened.push(r))
           } else if (rb) {
-            jsonPathRoots.push(rb)
+            flattened.push(rb)
           }
         }
+        return flattened
+      }
+
+      const jsonPathRoots = []
+
+      const jsonPathsBody = getAllCapValues(Capabilities.SIMPLEREST_BODY_JSONPATH, this.caps)
+      if (jsonPathsBody.length > 0) {
+        jsonPathRoots.push(..._extractFrom(body, jsonPathsBody))
       } else {
         jsonPathRoots.push(body)
       }
@@ -327,18 +334,35 @@ module.exports = class SimpleRestContainer {
           return retrievedMedia
         }
 
-        const _retrieveButtons = (jsonPathButtonRoot, jsonPathsButtons) => {
+        const _retrieveButtons = (jsonPathButtonRoot, capPrefix) => {
+          const jsonPathsButtons = getAllCapValues(`${capPrefix}_JSONPATH`, this.caps)
+          const jsonPathsButtonsText = getAllCapValues(`${capPrefix}_TEXT_SUBJSONPATH`, this.caps)
+          const jsonPathsButtonsPayload = getAllCapValues(`${capPrefix}_PAYLOAD_SUBJSONPATH`, this.caps)
+
           const retrievedButtons = []
-          jsonPathsButtons.forEach(jsonPath => {
-            const responseButtons = jp.query(jsonPathButtonRoot, jsonPath)
-            if (responseButtons) {
-              (_.isArray(responseButtons) ? _.flattenDeep(responseButtons) : [responseButtons]).forEach(b =>
-                retrievedButtons.push({
-                  text: b
-                })
-              )
+
+          const responseButtons = _extractFrom(jsonPathButtonRoot, jsonPathsButtons)
+          for (const responseButton of responseButtons) {
+            const retrievedButton = {}
+            if (_.isString(responseButton)) {
+              retrievedButton.text = responseButton
+            } else {
+              if (jsonPathsButtonsText.length > 0) {
+                const possibleTexts = _extractFrom(responseButton, jsonPathsButtonsText)
+                if (possibleTexts.length > 0) retrievedButton.text = possibleTexts[0]
+              }
+              if (jsonPathsButtonsPayload.length > 0) {
+                const possiblePayloads = _extractFrom(responseButton, jsonPathsButtonsPayload)
+                if (possiblePayloads.length > 0) retrievedButton.payload = possiblePayloads[0]
+              }
             }
-          })
+            if (Object.keys(retrievedButton).length === 0 && responseButton) {
+              retrievedButton.text = JSON.stringify(responseButton)
+            }
+            if (Object.keys(retrievedButton).length > 0) {
+              retrievedButtons.push(retrievedButton)
+            }
+          }
           return retrievedButtons
         }
 
@@ -356,7 +380,7 @@ module.exports = class SimpleRestContainer {
 
         const media = _retrieveMedia(jsonPathRoot, getAllCapValues(Capabilities.SIMPLEREST_MEDIA_JSONPATH, this.caps))
         debug(`found response media: ${util.inspect(media)}`)
-        const buttons = _retrieveButtons(jsonPathRoot, getAllCapValues(Capabilities.SIMPLEREST_BUTTONS_JSONPATH, this.caps))
+        const buttons = _retrieveButtons(jsonPathRoot, 'SIMPLEREST_BUTTONS')
         debug(`found response buttons: ${util.inspect(buttons)}`)
         const cards = []
 
@@ -377,7 +401,7 @@ module.exports = class SimpleRestContainer {
                 card.subtext = _getCardText(jp.query(c, jsonPath))
               })
 
-              card.buttons = _retrieveButtons(c, getAllCapValues(Capabilities.SIMPLEREST_CARD_BUTTONS_JSONPATH, this.caps))
+              card.buttons = _retrieveButtons(c, 'SIMPLEREST_CARD_BUTTONS')
               card.media = _retrieveMedia(c, getAllCapValues(Capabilities.SIMPLEREST_CARD_ATTACHMENTS_JSONPATH, this.caps))
 
               if (_.keys(card).length > 0) {
@@ -589,13 +613,17 @@ module.exports = class SimpleRestContainer {
       }))
       if (err) {
         debug(`_waitForUrlResponse error on url check ${pingConfig.uri}: ${err}`)
-        await timeout(pingConfig.timeout)
+        if (tries <= retries) {
+          await timeout(pingConfig.timeout)
+        }
       } else if (response.statusCode >= 400) {
         debug(`_waitForUrlResponse on url check ${pingConfig.uri} got error response: ${response.statusCode}/${response.statusMessage}`)
         if (debug.enabled && body) {
           debug(botiumUtils.shortenJsonString(body))
         }
-        await timeout(pingConfig.timeout)
+        if (tries <= retries) {
+          await timeout(pingConfig.timeout)
+        }
       } else {
         debug(`_waitForUrlResponse success on url check ${pingConfig.uri}: ${response.statusCode}/${response.statusMessage}`)
         this._storeCookiesFromResponse(response)

package/src/helpers/TranscriptUtils.js

@@ -0,0 +1,12 @@
+const _ = require('lodash')
+
+module.exports.hasWaitForBotTimeout = (transciptError) => {
+  if (!transciptError) {
+    return false
+  }
+  const str = transciptError.message || (_.isString(transciptError) ? transciptError : null)
+  if (!str) {
+    return false
+  }
+  return str.indexOf(': error waiting for bot - Bot did not respond within') > 0
+}

package/test/compiler/compilermarkdown.spec.js

@@ -118,7 +118,7 @@ describe('compiler.compilermarkdown', function () {
   })
   describe('negating', function () {
     it('should read ! as not', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_exclamation.md'))
       const context = buildContext()
 
       const caps = {
@@ -131,7 +131,7 @@ describe('compiler.compilermarkdown', function () {
       assert.equal(context.convos[0].conversation[1].asserters[0].not, true)
     })
     it('should read !! as !', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!!.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_two_exclamation.md'))
       const context = buildContext()
       const caps = {
       }
@@ -142,7 +142,7 @@ describe('compiler.compilermarkdown', function () {
       assert.equal(context.convos[0].conversation[1].not, false)
     })
     it('should read n*! as (n-1)*!', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!!!!.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_four_exclamation.md'))
       const context = buildContext()
 
       const caps = {
@@ -154,7 +154,7 @@ describe('compiler.compilermarkdown', function () {
       assert.equal(context.convos[0].conversation[1].not, false)
     })
     it('should read ! as ! in second line', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!_secline.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_exclamation_secline.md'))
       const context = buildContext()
       const caps = {
       }
@@ -167,7 +167,7 @@ describe('compiler.compilermarkdown', function () {
   })
   describe('optional', function () {
     it('should read ? as optional', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question.md'))
       const context = buildContext()
 
       const caps = {
@@ -180,7 +180,7 @@ describe('compiler.compilermarkdown', function () {
       assert.equal(context.convos[0].conversation[1].asserters[0].optional, true)
     })
     it('should fail if not all item optional in the same block', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?_invalid.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question_invalid.md'))
       const context = buildContext()
 
       const caps = {
@@ -195,7 +195,7 @@ describe('compiler.compilermarkdown', function () {
       }
     })
     it('should read ?? as ?', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with??.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_two_question.md'))
       const context = buildContext()
       const caps = {
       }
@@ -206,7 +206,7 @@ describe('compiler.compilermarkdown', function () {
       assert.equal(context.convos[0].conversation[1].optional, false)
     })
     it('should read n*? as (n-1)*?', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with????.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_four_question.md'))
       const context = buildContext()
 
       const caps = {
@@ -218,7 +218,7 @@ describe('compiler.compilermarkdown', function () {
       assert.equal(context.convos[0].conversation[1].optional, false)
     })
     it('should read ? as ? in second line', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?_secline.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question_secline.md'))
       const context = buildContext()
       const caps = {
       }
@@ -231,7 +231,7 @@ describe('compiler.compilermarkdown', function () {
   })
   describe('optional and negate', function () {
     it('should read ?! as optional and not', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?!.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question_exclamation.md'))
       const context = buildContext()
 
       const caps = {}
@@ -243,7 +243,7 @@ describe('compiler.compilermarkdown', function () {
       assert.equal(context.convos[0].conversation[1].not, true)
     })
     it('should read ??! as ?!', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with??!.md'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_two_question_exclamation.md'))
       const context = buildContext()
       const caps = {}
       const compiler = new Compiler(context, Object.assign({}, DefaultCapabilities, caps))

package/test/compiler/compilertxt.spec.js

@@ -42,7 +42,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation.length, 0)
   })
   it('should read ! as not', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_exclamation.convo.txt'))
     const context = buildContext()
 
     const caps = {
@@ -54,7 +54,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].not, true)
   })
   it('should read !! as !', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!!.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_two_exclamation.convo.txt'))
     const context = buildContext()
     const caps = {
     }
@@ -65,7 +65,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].not, false)
   })
   it('should read n*! as (n-1)*!', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!!!!.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_four_exclamation.convo.txt'))
     const context = buildContext()
 
     const caps = {
@@ -77,7 +77,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].not, false)
   })
   it('should read ! as ! in second line', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!_secline.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_exclamation_secline.convo.txt'))
     const context = buildContext()
     const caps = {
     }
@@ -88,7 +88,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].not, true)
   })
   it('should read ? as optional', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question.convo.txt'))
     const context = buildContext()
 
     const caps = {
@@ -100,7 +100,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].optional, true)
   })
   it('should read ?? as ?', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with??.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_two_question.convo.txt'))
     const context = buildContext()
     const caps = {
     }
@@ -111,7 +111,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].optional, false)
   })
   it('should read ?! as optional and not', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?!.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question_exclamation.convo.txt'))
     const context = buildContext()
 
     const caps = {
@@ -124,7 +124,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].optional, true)
   })
   it('should read ??! as ?!', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with??!.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_two_question_exclamation.convo.txt'))
     const context = buildContext()
 
     const caps = {
@@ -137,7 +137,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].optional, false)
   })
   it('should read n*? as (n-1)*?', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with????.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_four_question.convo.txt'))
     const context = buildContext()
 
     const caps = {
@@ -149,7 +149,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].optional, false)
   })
   it('should read ? as ? in second line', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?_secline.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question_secline.convo.txt'))
     const context = buildContext()
     const caps = {
     }
@@ -160,7 +160,7 @@ describe('compiler.compilertxt', function () {
     assert.equal(context.convos[0].conversation[1].optional, true)
   })
   it('should allow text starting with ##', async function () {
-    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_#.convo.txt'))
+    const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_hashmark.convo.txt'))
     const context = buildContext()
     const caps = {
     }

package/test/compiler/compilerxlsx.spec.js

@@ -153,7 +153,7 @@ describe('compiler.compilerxlsx', function () {
   })
   describe('negating', function () {
     it('should read ! as not', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_exclamation.xlsx'))
       const context = buildContext()
 
       const caps = {
@@ -165,7 +165,7 @@ describe('compiler.compilerxlsx', function () {
       assert.equal(context.convos[0].conversation[1].not, true)
     })
     it('should read !! as !', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!!.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_two_exclamation.xlsx'))
       const context = buildContext()
       const caps = {
       }
@@ -176,7 +176,7 @@ describe('compiler.compilerxlsx', function () {
       assert.equal(context.convos[0].conversation[1].not, false)
     })
     it('should read n*! as (n-1)*!', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!!!!.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_four_exclamation.xlsx'))
       const context = buildContext()
 
       const caps = {
@@ -188,7 +188,7 @@ describe('compiler.compilerxlsx', function () {
       assert.equal(context.convos[0].conversation[1].not, false)
     })
     it('should read ! as ! in second line', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with!_secline.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_exclamation_secline.xlsx'))
       const context = buildContext()
       const caps = {
       }
@@ -201,7 +201,7 @@ describe('compiler.compilerxlsx', function () {
   })
   describe('optional', function () {
     it('should read ? as optional', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question.xlsx'))
       const context = buildContext()
 
       const caps = {
@@ -213,7 +213,7 @@ describe('compiler.compilerxlsx', function () {
       assert.equal(context.convos[0].conversation[1].optional, true)
     })
     it('should read ?? as ?', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with??.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_two_question.xlsx'))
       const context = buildContext()
       const caps = {
       }
@@ -224,7 +224,7 @@ describe('compiler.compilerxlsx', function () {
       assert.equal(context.convos[0].conversation[1].optional, false)
     })
     it('should read n*? as (n-1)*?', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with????.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_four_question.xlsx'))
       const context = buildContext()
 
       const caps = {
@@ -236,7 +236,7 @@ describe('compiler.compilerxlsx', function () {
       assert.equal(context.convos[0].conversation[1].optional, false)
     })
     it('should read ? as ? in second line', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?_secline.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question_secline.xlsx'))
       const context = buildContext()
       const caps = {
       }
@@ -249,7 +249,7 @@ describe('compiler.compilerxlsx', function () {
   })
   describe('optional and negate', function () {
     it('should read ?! as optional and not', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with?!.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_question_exclamation.xlsx'))
       const context = buildContext()
 
       const caps = {}
@@ -261,7 +261,7 @@ describe('compiler.compilerxlsx', function () {
       assert.equal(context.convos[0].conversation[1].not, true)
     })
     it('should read ??! as ?!', async function () {
-      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with??!.xlsx'))
+      const scriptBuffer = fs.readFileSync(path.resolve(__dirname, CONVOS_DIR, 'convos_with_two_question_exclamation.xlsx'))
       const context = buildContext()
       const caps = {}
       const compiler = new Compiler(context, Object.assign({}, DefaultCapabilities, caps))