botium-core 1.13.19 → 1.14.1

package/test/logichooks/hookfromsrc.spec.js

@@ -36,7 +36,13 @@ describe('logichooks.hookfromsrc', function () {
         [Capabilities.ASSERTERS]: [{
           ref: 'CUSTOMASSERTER',
           src: {
-            assertConvoStep: 'if (botMsg.messageText === "Hello") result=Promise.resolve(); else result=Promise.reject(new Error("expected Hello"))'
+            assertConvoStep: ({ botMsg }) => {
+              if (botMsg.messageText === 'Hello') {
+                return Promise.resolve()
+              } else {
+                return Promise.reject(new Error('expected Hello'))
+              }
+            }
           }
         }]
       })
@@ -48,7 +54,10 @@ describe('logichooks.hookfromsrc', function () {
         [Capabilities.ASSERTERS]: [{
           ref: 'CUSTOMASSERTER',
           src: {
-            assertConvoStep: 'if (botMsg.messageText === "Hello1") module.exports=Promise.resolve(); else module.exports=Promise.reject(new Error("expected Hello1"))'
+            assertConvoStep: ({ botMsg }) => {
+              if (botMsg.messageText === 'Hello1') return Promise.resolve()
+              else return Promise.reject(new Error('expected Hello1'))
+            }
           }
         }]
       })
@@ -74,7 +83,8 @@ describe('logichooks.hookfromsrc', function () {
         await compiler.convos[0].Run(container)
         assert.fail('it should have failed')
       } catch (err) {
-        assert.isTrue(err.message.includes('Line 6: assertion error - Script assertConvoStep is not valid'))
+        console.log(err.message)
+        assert.isTrue(err.message.includes('Line 6: assertion error - Script assertConvoStep is not valid - only functions accepted'))
       }
     })
   })

package/test/plugins/plugins.spec.js

@@ -27,7 +27,7 @@ describe('plugins.plugins', function () {
   })
 
   describe('load', function () {
-    it('should map simple function to class', async function () {
+    it('should map simple function from module to class', async function () {
       const myCaps = {
         [Capabilities.PROJECTNAME]: 'plugins.load',
         [Capabilities.CONTAINERMODE]: 'fromfile1'
@@ -39,7 +39,20 @@ describe('plugins.plugins', function () {
       const response = await container.WaitBotSays()
       assert.equal(response.messageText, 'TEST')
     })
-    it('should use UserSays function as class', async function () {
+    it('should map simple function from file to class', async function () {
+      const myCaps = {
+        [Capabilities.PROJECTNAME]: 'plugins.load',
+        [Capabilities.SAFEDIR]: './test/plugins/plugindir',
+        [Capabilities.CONTAINERMODE]: 'fromfile/botium-connector-fromfile1.js'
+      }
+      const driver = new BotDriver(myCaps)
+      const container = await driver.Build()
+
+      await container.UserSays({ messageText: 'TEST' })
+      const response = await container.WaitBotSays()
+      assert.equal(response.messageText, 'TEST')
+    })
+    it('should use UserSays function from module as class', async function () {
       const myCaps = {
         [Capabilities.PROJECTNAME]: 'plugins.load',
         [Capabilities.CONTAINERMODE]: 'fromfile2',
@@ -48,6 +61,20 @@ describe('plugins.plugins', function () {
       const driver = new BotDriver(myCaps)
       const container = await driver.Build()
 
+      await container.UserSays({ messageText: 'TEST' })
+      const response = await container.WaitBotSays()
+      assert.equal(response.messageText, 'MYPREFIX:TEST')
+    })
+    it('should use UserSays function from file as class', async function () {
+      const myCaps = {
+        [Capabilities.PROJECTNAME]: 'plugins.load',
+        [Capabilities.SAFEDIR]: './test/plugins/plugindir',
+        [Capabilities.CONTAINERMODE]: 'fromfile/botium-connector-fromfile2.js',
+        cap1: 'MYPREFIX'
+      }
+      const driver = new BotDriver(myCaps)
+      const container = await driver.Build()
+
       await container.UserSays({ messageText: 'TEST' })
       const response = await container.WaitBotSays()
       assert.equal(response.messageText, 'MYPREFIX:TEST')

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

@@ -4,17 +4,17 @@ custom embedded
 hello
 
 #bot
-hello should not assert
-CONDITIONAL_STEP_LOGIC_HOOK { "skip":true }|G1
+hello
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":false }|G1
 
 #bot
 hello should not assert
-CONDITIONAL_STEP_LOGIC_HOOK { "skip":true }|G1
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":false }|G1
 
 #bot
-hello should not assert
-CONDITIONAL_STEP_LOGIC_HOOK { "skip":true }|G2
+hello
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":false }|G2
 
 #bot
 hello should not assert
-CONDITIONAL_STEP_LOGIC_HOOK { "skip":true }|G2
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":false }|G2

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

@@ -0,0 +1,20 @@
+custom embedded
+
+#me
+hello
+
+#bot
+hello should not assert
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":true }|G1
+
+#bot
+hello
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":false }|G1
+
+#bot
+hello should not assert
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":true }|G2
+
+#bot
+hello should not assert
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":true }|G2

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

@@ -0,0 +1,20 @@
+custom embedded
+
+#me
+hello
+
+#bot
+?hello
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":false }|G1
+
+#bot
+?hello should not assert
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":false }|G1
+
+#bot
+?hello 2
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":false }|G2
+
+#bot
+?hello should not assert
+CONDITIONAL_STEP_LOGIC_HOOK { "skip":true }|G2

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

@@ -101,5 +101,21 @@ describe('convo with custom conditional logichook', function () {
       const transript = await this.compiler.convos[0].Run(this.container)
       assert.equal(transript.steps.length, 3)
     })
+
+    it('should fail mandatory condition group if no condition met', async function () {
+      try {
+        this.compiler.ReadScript(path.resolve(__dirname, 'convos'), 'conditional_steps_multiple_mandatory_condition_groups.convo.txt')
+        await this.compiler.convos[0].Run(this.container)
+        assert.fail('it should have failed')
+      } catch (e) {
+        assert.equal(e.message, 'custom embedded/Line 18: Non of the conditions are met in \'G2\' condition group')
+      }
+    })
+
+    it('should not fail optional condition group if no condition met', async function () {
+      this.compiler.ReadScript(path.resolve(__dirname, 'convos'), 'conditional_steps_multiple_optional_condition_groups.convo.txt')
+      const transript = await this.compiler.convos[0].Run(this.container)
+      assert.equal(transript.steps.length, 2)
+    })
   })
 })

package/test/security/allowUnsafe.spec.js

@@ -5,7 +5,6 @@ chai.use(chaiAsPromised)
 const assert = chai.assert
 const BotDriver = require('../../').BotDriver
 const Capabilities = require('../../').Capabilities
-const { BotiumError } = require('../../src/scripting/BotiumError')
 const HookUtils = require('../../src/helpers/HookUtils')
 
 const myCapsSimpleRest = {
@@ -17,21 +16,6 @@ const myCapsSimpleRest = {
   [Capabilities.SIMPLEREST_RESPONSE_JSONPATH]: ['$']
 }
 
-const echoConnector = ({ queueBotSays }) => {
-  return {
-    UserSays (msg) {
-      const botMsg = { sender: 'bot', sourceData: msg.sourceData, messageText: `You said: "${msg.messageText}"` }
-      queueBotSays(botMsg)
-    }
-  }
-}
-
-const myCapsEcho = {
-  [Capabilities.CONTAINERMODE]: echoConnector,
-  [Capabilities.SECURITY_ALLOW_UNSAFE]: false,
-  [Capabilities.SCRIPTING_ENABLE_MEMORY]: true
-}
-
 const _getSimpleRestCaps = (caps) => {
   return Object.assign(
     {},
@@ -57,11 +41,6 @@ const functionConnector = ({ queueBotSays }) => {
 
 describe('security.allowUnsafe', function () {
   describe('hook utils', function () {
-    it('should accept string hook in safe mode', async function () {
-      HookUtils.getHook({
-        [Capabilities.SECURITY_ALLOW_UNSAFE]: false
-      }, '1+1')
-    })
     it('should accept javascript hook in safe mode', async function () {
       HookUtils.getHook({
         [Capabilities.SECURITY_ALLOW_UNSAFE]: false
@@ -74,20 +53,26 @@ describe('security.allowUnsafe', function () {
         }, 'test/security/resources/hook-as-file.js')
         assert.fail('should have failed')
       } catch (err) {
-        assert.isTrue(err instanceof BotiumError)
-        assert.exists(err.context)
-        assert.equal(err.context.message, 'Security Error. Using unsafe custom hook with require is not allowed')
-        assert.equal(err.context.source, 'HookUtils.js')
-        assert.equal(err.context.type, 'security')
-        assert.equal(err.context.subtype, 'allow unsafe')
-        assert.exists(err.context.cause)
-        assert.equal(err.context.cause.hookData, 'test/security/resources/hook-as-file.js')
+        console.log(err.message)
+        assert.isTrue(err.message.indexOf('invalid') >= 0)
       }
     })
-    it('should accept file hook in unsafe mode', async function () {
+    it('should accept file hook from safe dir in unsafe mode', async function () {
       HookUtils.getHook({
-        [Capabilities.SECURITY_ALLOW_UNSAFE]: true
-      }, 'test/security/resources/hook-as-file.js')
+        [Capabilities.SECURITY_ALLOW_UNSAFE]: true,
+        [Capabilities.SAFEDIR]: 'test/security/'
+      }, 'resources/hook-as-file.js')
+    })
+    it('should not accept file hook from outside safe dir', async function () {
+      try {
+        HookUtils.getHook({
+          [Capabilities.SECURITY_ALLOW_UNSAFE]: true,
+          [Capabilities.SAFEDIR]: 'test/security/'
+        }, '../hook-as-file.js')
+        assert.fail('should have failed')
+      } catch (err) {
+        assert.isTrue(err.message.indexOf('invalid') >= 0)
+      }
     })
     it('should accept require hook in unsafe mode', async function () {
       HookUtils.getHook({
@@ -96,19 +81,6 @@ describe('security.allowUnsafe', function () {
     })
   })
 
-  describe('scripting memory', function () {
-    it('should not throw security error for using inline function', async function () {
-      const driver = new BotDriver(myCapsEcho)
-      const compiler = driver.BuildCompiler()
-      const container = await driver.Build()
-      await container.Start()
-
-      compiler.ReadScript(path.resolve(__dirname, 'convos'), 'withscriptingmemoryfunction.convo.txt')
-      await compiler.convos[0].Run(container)
-      await container.Clean()
-    }).timeout(50000)
-  })
-
   describe('simple rest, scripting memory', function () {
     it('should use variables succesful', async function () {
       const myCaps = _getSimpleRestCaps(
@@ -145,19 +117,6 @@ describe('security.allowUnsafe', function () {
   })
 
   describe('simple rest, hooks', function () {
-    it('should create and use simplerest with javascript hook', async function () {
-      const driver = new BotDriver(_getSimpleRestCaps(
-        {
-          [Capabilities.SIMPLEREST_REQUEST_HOOK]: '1+1'
-        }
-      ))
-
-      const compiler = driver.BuildCompiler()
-      const container = await driver.Build()
-      await container.Start()
-
-      compiler.ReadScript(path.resolve(__dirname, 'convos'), 'dummy.convo.txt')
-    })
     it('should create and use simplerest with function hooks', async function () {
       const driver = new BotDriver(_getSimpleRestCaps(
         {
@@ -173,35 +132,6 @@ describe('security.allowUnsafe', function () {
     })
   })
 
-  describe('precompilers', function () {
-    it('should not throw security error for inline script type', async function () {
-      const driver = new BotDriver(_getSimpleRestCaps(
-        {
-          [Capabilities.PRECOMPILERS]: {
-            NAME: 'SCRIPT',
-            SCRIPT: '1+1'
-          }
-        }
-      ))
-
-      const compiler = driver.BuildCompiler()
-      const container = await driver.Build()
-      const fileName = 'dummy.convo.txt'
-      compiler.ReadScript(path.resolve(__dirname, 'convos'), fileName)
-      assert.equal(compiler.convos.length, 1)
-      await container.Clean()
-    })
-  })
-
-  describe('base container, hooks', function () {
-    it('should not throw security error for using inline hook', async function () {
-      const driver = new BotDriver(_getSimpleRestCaps(
-        { [Capabilities.CUSTOMHOOK_ONUSERSAYS]: '1+1' }
-      ))
-      await driver.Build()
-    })
-  })
-
   describe('logic hook, asserter', function () {
     it('should load asserter from file', async function () {
       const driver = new BotDriver(_getSimpleRestCaps(
@@ -216,45 +146,6 @@ describe('security.allowUnsafe', function () {
 
       driver.BuildCompiler()
     })
-    it('should not throw security error for logic hook with inline src', async function () {
-      const driver = new BotDriver(_getSimpleRestCaps(
-        {
-          [Capabilities.LOGIC_HOOKS]: [
-            {
-              ref: 'MY-LOGICHOOK-NAME',
-              src: {
-                onMeStart: '1+1'
-              },
-              global: false,
-              args: {
-                'my-arg-1': 'something'
-              }
-            }
-          ]
-        }
-      ))
-
-      driver.BuildCompiler()
-    })
-    it('should not throw security error for global logic hook with inline src', async function () {
-      const driver = new BotDriver(_getSimpleRestCaps(
-        {
-          [Capabilities.LOGIC_HOOKS]: [
-            {
-              ref: 'MY-LOGICHOOK-NAME',
-              src: {
-                onMeStart: '1+1'
-              },
-              global: true,
-              args: {
-                'my-arg-1': 'something'
-              }
-            }
-          ]
-        }
-      ))
-      driver.BuildCompiler()
-    })
   })
 
   describe('connectors', function () {
@@ -270,10 +161,10 @@ describe('security.allowUnsafe', function () {
       })
       await driver.Build()
     })
-
-    it('should create any connector from file/dir, if its starts with botium-connector prefix', async function () {
+    it('should create any connector from safedir', async function () {
       const driver = new BotDriver({
-        [Capabilities.CONTAINERMODE]: 'botium-connector-as-file',
+        [Capabilities.SAFEDIR]: 'test/security/',
+        [Capabilities.CONTAINERMODE]: 'resources/botium-connector-as-file.js',
         [Capabilities.SECURITY_ALLOW_UNSAFE]: false
       })
       await driver.Build()