Read timeout from delegate definition. (#106)

adobe · May 18, 2020 · f28b965 · f28b965
1 parent 2eec8bd
commit f28b965
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adobe/reactor-turbine",
-  "version": "26.0.0",
+  "version": "26.0.1",
   "description": "Launch rule engine which processes rules on client websites and delegates logic to extensions.",
   "license": "Apache-2.0",
   "scripts": {

diff --git a/src/rules/__tests__/createAddActionToQueue.test.js b/src/rules/__tests__/createAddActionToQueue.test.js
@@ -108,7 +108,7 @@ describe('createAddActionToQueue returns a function that when called', function
       normalizeRuleComponentError,
       logActionError
     )(
-      { modulePath: 'action1', settings: { timeout: 10 } },
+      { modulePath: 'action1', timeout: 10, settings: {} },
       rule,
       event,
       lastPromiseInQueue

diff --git a/src/rules/__tests__/createAddConditionToQueue.test.js b/src/rules/__tests__/createAddConditionToQueue.test.js
@@ -172,7 +172,7 @@ describe('createAddRuleToQueue returns a function that when called', function ()
     var logConditionError = emptyFn;
     var logConditionNotMet = emptyFn;
     var lastPromiseInQueue = Promise.resolve();
-    var condition = { modulePath: 'condition1', settings: { timeout: 10 } };
+    var condition = { modulePath: 'condition1', timeout: 10, settings: {} };
 
     return createAddConditionToQueue(
       executeDelegateModule,

diff --git a/src/rules/createAddActionToQueue.js b/src/rules/createAddActionToQueue.js
@@ -22,7 +22,7 @@ module.exports = function (
       var timeoutId;
 
       return new Promise(function (resolve, reject) {
-        var promiseTimeout = action.settings.timeout;
+        var promiseTimeout = action.timeout;
 
         var moduleResult = executeDelegateModule(action, syntheticEvent, [
           syntheticEvent

diff --git a/src/rules/createAddConditionToQueue.js b/src/rules/createAddConditionToQueue.js
@@ -24,7 +24,7 @@ module.exports = function (
       var timeoutId;
 
       return new Promise(function (resolve, reject) {
-        var promiseTimeout = condition.settings.timeout;
+        var promiseTimeout = condition.timeout;
 
         timeoutId = setTimeout(function () {
           // Reject instead of resolve to prevent subsequent