Merge branch 'master' into sandrosov/API-3/Extend-API-Info-response--master

# Conflicts:
#	package-lock.json
#	package.json

Author: Valodya

backendless.d.ts

@@ -612,10 +612,12 @@ declare module Backendless {
          * @type: Function
          */
 
+        type Execution = 'any' | 'all' | string
+
         function activateFlow(flowName: string, initialData?: object): Promise<void>
         function activateFlowById(flowId: string, initialData?: object): Promise<void>
         function activateFlowTrigger(flowName: string, triggerName: string, data?: object): Promise<void>
-        function activateFlowTriggerById(flowId: string, triggerId: string, data?: object): Promise<void>
+        function activateFlowTriggerById(flowId: string, triggerId: string, data?: object, execution?: Execution): Promise<void>
     }
 
     /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "backendless",
-  "version": "7.3.1",
+  "version": "7.3.7",
   "description": "Backendless JavaScript SDK for Node.js and the browser",
   "browser": "dist/backendless.js",
   "main": "lib/index.js",

src/automations/index.js

@@ -58,7 +58,7 @@ export default class Automations {
     })
   }
 
-  async activateFlowTriggerById(flowId, triggerId, data) {
+  async activateFlowTriggerById(flowId, triggerId, data, execution) {
     if (!flowId || typeof flowId !== 'string') {
       throw new Error('The "flowId" argument must be provided and must be a string.')
     }
@@ -71,9 +71,17 @@ export default class Automations {
       throw new Error('The "data" argument must be an object.')
     }
 
+    if (execution !== undefined && (typeof execution !== 'string' || !execution)) {
+      throw new Error(
+        // eslint-disable-next-line
+        'The "execution" argument must be a non-empty string and must be one of this values: "any", "all" or Execution ID.'
+      )
+    }
+
     return this.app.request.post({
-      url : `${this.app.urls.automationFlow()}/${flowId}/trigger/${triggerId}/activate`,
-      data: data || {},
+      url  : `${this.app.urls.automationFlow()}/${flowId}/trigger/${triggerId}/activate`,
+      data : data || {},
+      query: { execution },
     })
   }
 }

test/tsd.ts

@@ -1529,12 +1529,13 @@ function testAutomations() {
     const flowId: string = 'id';
     const triggerName: string = 'str';
     const triggerId: string = 'id';
+    const execution: string = 'id';
     let promiseObject: Promise<void>;
 
     promiseObject = Backendless.Automations.activateFlow(flowName, obj);
     promiseObject = Backendless.Automations.activateFlowById(flowId, obj);
     promiseObject = Backendless.Automations.activateFlowTrigger(flowName, triggerName, obj);
-    promiseObject = Backendless.Automations.activateFlowTriggerById(flowId, triggerId, obj);
+    promiseObject = Backendless.Automations.activateFlowTriggerById(flowId, triggerId, obj, execution);
 }
 
 function testMessaging() {

test/unit/specs/automations/basic.js

@@ -8,6 +8,9 @@ describe('<Automations> Basic', function() {
 
   const FLOW_NAME = 'FlowName'
   const FLOW_ID = 'FlowID'
+  const EXECUTION_ID = 'ExecutionID'
+  const EXECUTION_ANY = 'any'
+  const EXECUTION_ALL = 'all'
   const TRIGGER_NAME = 'TriggerName'
   const TRIGGER_ID = 'TriggerID'
 
@@ -198,8 +201,15 @@ describe('<Automations> Basic', function() {
     it('success', async () => {
       const req1 = prepareMockRequest()
       const req2 = prepareMockRequest()
+      const req3 = prepareMockRequest()
+      const req4 = prepareMockRequest()
+      const req5 = prepareMockRequest()
+
       await Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID)
       await Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, { name: 'Nick' })
+      await Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, { name: 'Nick' }, EXECUTION_ID)
+      await Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, { name: 'Nick' }, EXECUTION_ANY)
+      await Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, { name: 'Nick' }, EXECUTION_ALL)
 
       expect(req1).to.deep.include({
         method: 'POST',
@@ -215,6 +225,30 @@ describe('<Automations> Basic', function() {
         }
       })
 
+      expect(req3).to.deep.include({
+        method: 'POST',
+        path  : `${APP_PATH}/automation/flow/${ FLOW_ID }/trigger/${ TRIGGER_ID }/activate?execution=ExecutionID`,
+        body  : {
+          name: 'Nick',
+        }
+      })
+
+      expect(req4).to.deep.include({
+        method: 'POST',
+        path  : `${APP_PATH}/automation/flow/${ FLOW_ID }/trigger/${ TRIGGER_ID }/activate?execution=any`,
+        body  : {
+          name: 'Nick',
+        }
+      })
+
+      expect(req5).to.deep.include({
+        method: 'POST',
+        path  : `${APP_PATH}/automation/flow/${ FLOW_ID }/trigger/${ TRIGGER_ID }/activate?execution=all`,
+        body  : {
+          name: 'Nick',
+        }
+      })
+
     })
 
     it('fails when flow id is invalid', async () => {
@@ -262,6 +296,20 @@ describe('<Automations> Basic', function() {
       await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, [])).to.eventually.be.rejectedWith(errorMsg)
       await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, () => ({}))).to.eventually.be.rejectedWith(errorMsg)
     })
+
+    it('fails when execution id is invalid', async () => {
+      // eslint-disable-next-line
+      const errorMsg = 'The "execution" argument must be a non-empty string and must be one of this values: "any", "all" or Execution ID.'
+
+      await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, {}, null)).to.eventually.be.rejectedWith(errorMsg)
+      await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, {}, true)).to.eventually.be.rejectedWith(errorMsg)
+      await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, {}, false)).to.eventually.be.rejectedWith(errorMsg)
+      await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, {}, 0)).to.eventually.be.rejectedWith(errorMsg)
+      await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, {}, 123)).to.eventually.be.rejectedWith(errorMsg)
+      await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, {}, [])).to.eventually.be.rejectedWith(errorMsg)
+      await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, {}, () => ({}))).to.eventually.be.rejectedWith(errorMsg)
+      await expect(Backendless.Automations.activateFlowTriggerById(FLOW_ID, TRIGGER_ID, {}, '')).to.eventually.be.rejectedWith(errorMsg)
+    })
   })
 
 })