Fix timeout.

adobe · Nov 7, 2018 · 4f10bf0 · 4f10bf0
1 parent 058f896
commit 4f10bf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/__tests__/initRules.test.js b/src/__tests__/initRules.test.js
@@ -1709,7 +1709,6 @@ describe('initRules', function() {
                   module.exports = jasmine.createSpy().and.callFake(function() {
                     return new Promise(function(resolve) {
                       setTimeout(function() {
-                        callOrder.push('Action1');
                         resolve();
                       }, 3000);
 

diff --git a/src/initRules.js b/src/initRules.js
@@ -25,7 +25,7 @@ var logQueueWarningOnce = function() {
     queueWarningLogged = true;
     logger.warn(
       'Rule queueing is only intended for testing purposes. Queueing behavior may be ' +
-      'changed or removed at any time.'
+        'changed or removed at any time.'
     );
   }
 };
@@ -149,9 +149,9 @@ module.exports = function(
               );
             }, PROMISE_TIMEOUT);
 
-            resolve(
+            Promise.resolve(
               executeDelegateModule(condition, syntheticEvent, [syntheticEvent])
-            );
+            ).then(resolve, reject);
           })
             .catch(function(e) {
               clearTimeout(timeoutId);
@@ -184,9 +184,9 @@ module.exports = function(
               );
             }, PROMISE_TIMEOUT);
 
-            resolve(
+            Promise.resolve(
               executeDelegateModule(action, syntheticEvent, [syntheticEvent])
-            );
+            ).then(resolve, reject);
           })
             .then(function() {
               clearTimeout(timeoutId);