wingbot 3.33.0 → 3.33.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.33.0",
+  "version": "3.33.1",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/src/ConversationTester.js

@@ -603,19 +603,13 @@ class ConversationTester {
             } else {
                 const quickReplyRequired = action.match(/^>/);
                 const cleanAction = action.replace(/^>/, '');
-                let found;
 
                 // action in quick reply
                 if (action.match(/^>\//)) {
                     await t.quickReply(cleanAction);
-                    found = true;
+                } else if (quickReplyRequired) {
+                    await t.quickReplyText(cleanAction);
                 } else {
-                    found = await t.quickReplyText(cleanAction);
-                }
-
-                if (!found && quickReplyRequired) {
-                    throw new Error(`Quick reply "${action.replace(/^>/, '')}" was required, but has not been found`);
-                } else if (!found) {
                     await t.text(action);
                 }
             }

package/src/Tester.js

@@ -452,7 +452,7 @@ class Tester {
     }
 
     /**
-     * Send quick reply if text exactly matches, otherwise returns false
+     * Send quick reply if text exactly matches, otherwise throws exception
      *
      * @param {string} text
      * @returns {Promise<boolean>}
@@ -460,22 +460,37 @@ class Tester {
      * @memberOf Tester
      */
     async quickReplyText (text) {
+        let found = '';
+        let but = 'has not been found';
 
         if (this.responses.length !== 0) {
-            const search = tokenize(text);
+            const normalize = (t) => `${t}`.toLocaleLowerCase().replace(/\s+/g, ' ').trim();
+            const normalizedText = normalize(text);
+            const search = tokenize(normalizedText);
             const last = this.responses[this.responses.length - 1];
             const quickReplys = asserts.getQuickReplies(last);
-            const res = quickReplys
+            let res = quickReplys
                 .filter(({ title = '', payload }) => title && payload && tokenize(title) === search);
 
-            if (res[0]) {
+            if (res.length > 1) {
+                res = res
+                    .filter(({ title = '' }) => normalize(title) === normalizedText);
+            }
+
+            if (res.length === 1) {
                 const { title, payload } = res[0];
                 await this.processMessage(Request.quickReplyText(this.senderId, title, payload));
                 return true;
             }
+
+            if (res.length > 1) {
+                but = 'found multiple occurences';
+            }
+
+            found = ` (found: ${quickReplys.map((q) => q.title).filter((q) => !!q).join(', ')})`;
         }
 
-        return false;
+        throw new Error(`Quick reply "${text}" was required, but ${but}.${found}`);
     }
 
     /**