botium-core 1.14.6 → 1.14.8

package/package.json

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

package/src/containers/PluginConnectorContainer.js

@@ -44,7 +44,7 @@ module.exports = class PluginConnectorContainer extends BaseContainer {
       return super.Build().then(() => promiseRetry((retry, number) => {
         return (this.pluginInstance.Build ? (this.pluginInstance.Build() || Promise.resolve()) : Promise.resolve())
           .catch((err) => {
-            if (this.retryHelperBuild.shouldRetry(err)) {
+            if (this.retryHelperBuild.shouldRetry(err, number)) {
               debug(`Build trial #${number} failed, retry activated`)
               retry(err)
             } else {
@@ -65,7 +65,7 @@ module.exports = class PluginConnectorContainer extends BaseContainer {
       return super.Start().then(() => promiseRetry((retry, number) => {
         return (this.pluginInstance.Start ? (this.pluginInstance.Start() || Promise.resolve()) : Promise.resolve())
           .catch((err) => {
-            if (this.retryHelperStart.shouldRetry(err)) {
+            if (this.retryHelperStart.shouldRetry(err, number)) {
               debug(`Start trial #${number} failed, retry activated`)
               retry(err)
             } else {
@@ -91,7 +91,7 @@ module.exports = class PluginConnectorContainer extends BaseContainer {
       return promiseRetry((retry, number) => {
         return (this.pluginInstance.UserSays(mockMsg) || Promise.resolve())
           .catch((err) => {
-            if (this.retryHelperUserSays.shouldRetry(err)) {
+            if (this.retryHelperUserSays.shouldRetry(err, number)) {
               debug(`UserSays trial #${number} failed, retry activated`)
               retry(err)
             } else {
@@ -115,7 +115,7 @@ module.exports = class PluginConnectorContainer extends BaseContainer {
       return super.Stop().then(() => promiseRetry((retry, number) => {
         return (this.pluginInstance.Stop ? (this.pluginInstance.Stop() || Promise.resolve()) : Promise.resolve())
           .catch((err) => {
-            if (this.retryHelperStop.shouldRetry(err)) {
+            if (this.retryHelperStop.shouldRetry(err, number)) {
               debug(`Stop trial #${number} failed, retry activated`)
               retry(err)
             } else {
@@ -142,7 +142,7 @@ module.exports = class PluginConnectorContainer extends BaseContainer {
       return promiseRetry((retry, number) => {
         return (this.pluginInstance.Clean ? (this.pluginInstance.Clean() || Promise.resolve()) : Promise.resolve())
           .catch((err) => {
-            if (this.retryHelperClean.shouldRetry(err)) {
+            if (this.retryHelperClean.shouldRetry(err, number)) {
               debug(`Clean trial #${number} failed, retry activated`)
               retry(err)
             } else {

package/src/helpers/RetryHelper.js

@@ -30,8 +30,10 @@ module.exports = class RetryHelper {
     }
   }
 
-  shouldRetry (err) {
+  shouldRetry (err, currentRetryCount) {
     if (!err) return false
+    if (!this.retrySettings.retries) return false
+    if (this.retrySettings.retries < currentRetryCount) return false
     if (this.retryErrorPatterns.length === 0) return true
     const errString = util.inspect(err)
     for (const re of this.retryErrorPatterns) {

package/src/scripting/ScriptingProvider.js

@@ -36,7 +36,7 @@ const p = (retryHelper, fn) => {
   if (retryHelper) {
     return promiseRetry((retry, number) => {
       return promise().catch(err => {
-        if (retryHelper.shouldRetry(err)) {
+        if (retryHelper.shouldRetry(err, number)) {
           debug(`Asserter trial #${number} failed, retry activated`)
           retry(err)
         } else {
@@ -62,7 +62,7 @@ const pnot = (retryHelper, fn, errTemplate) => {
   if (retryHelper) {
     return promiseRetry((retry, number) => {
       return promise().catch(() => {
-        if (retryHelper.shouldRetry(errTemplate)) {
+        if (retryHelper.shouldRetry(errTemplate, number)) {
           debug(`Asserter trial #${number} failed, !retry activated`)
           retry(errTemplate)
         } else {

package/src/scripting/logichook/asserter/BaseTextAsserter.js

@@ -1,4 +1,7 @@
+const Capabilities = require('../../../Capabilities')
 const { BotiumError } = require('../../BotiumError')
+const { normalizeText, toString } = require('../../helper')
+const _ = require('lodash')
 
 module.exports = class BaseTextAsserter {
   constructor (context, caps = {}, matchFn = null, mode = null, noArgIsJoker = false) {
@@ -12,6 +15,18 @@ module.exports = class BaseTextAsserter {
     this.noArgIsJoker = noArgIsJoker
   }
 
+  _checkNormalizeText (str) {
+    return normalizeText(str, !!this.caps[Capabilities.SCRIPTING_NORMALIZE_TEXT])
+  }
+
+  _normalize (botresponse) {
+    if (_.isUndefined(botresponse) || _.isNil(botresponse)) return ''
+    if (_.isObject(botresponse) && _.has(botresponse, 'messageText')) {
+      return toString(botresponse.messageText) || ''
+    }
+    return toString(botresponse)
+  }
+
   _evalText (convo, args, botMsg) {
     let allUtterances = []
     if (this.noArgIsJoker && (!args || args.length === 0)) {
@@ -24,7 +39,7 @@ module.exports = class BaseTextAsserter {
     const founds = []
     const notFounds = []
     for (const utterance of allUtterances) {
-      (this.matchFn(botMsg, utterance) ? founds : notFounds).push(utterance)
+      (this.matchFn(this._checkNormalizeText(this._normalize(botMsg)), this._checkNormalizeText(utterance)) ? founds : notFounds).push(utterance)
     }
     return { found: (this.mode === 'all' ? notFounds.length === 0 : founds.length > 0), allUtterances, founds, notFounds }
   }