Retry fix (#1070)

* started fixing retries

* Fixed UnhadnledException for retries in recorder

* reverted some recorder changes

* fixed linting

Author: DavertMik

examples/github_test.js

@@ -5,6 +5,13 @@ Before((Smth) => {
   Smth.openGitHub();
 });
 
+Scenario('Visit Home Page @retry', (I) => {
+  // .retry({ retries: 3, minTimeout: 1000 })
+  I.retry(2).see('GitHub');
+  I.retry(3).see('ALL');
+  I.retry(2).see('IMAGES');
+});
+
 Scenario('search @grop', (I) => {
   I.amOnPage('https://github.com/search');
   I.fillField('Search GitHub', 'CodeceptJS');

lib/recorder.js

@@ -18,12 +18,14 @@ const defaultRetryOptions = {
   maxTimeout: 10000,
 };
 
-
 /**
  * Singleton object to record all test steps as promises and run them in chain.
  */
 module.exports = {
 
+  /**
+   * @var retries Array[object]
+   */
   retries: [],
 
   /**
@@ -123,6 +125,7 @@ module.exports = {
     tasks.push(taskName);
     // log(`${currentQueue()}Queued | ${taskName}`);
 
+
     return promise = Promise.resolve(promise).then((res) => {
       const retryOpts = this.retries.slice(-1).pop();
       // no retries or unnamed tasks
@@ -132,9 +135,11 @@ module.exports = {
 
       return promiseRetry(Object.assign(defaultRetryOptions, retryOpts), (retry, number) => {
         if (number > 1) log(`${currentQueue()}Retrying... Attempt #${number}`);
+
+        const retryRules = this.retries.reverse();
+
         return Promise.resolve(res).then(fn).catch((err) => {
-          // does retry handled or should be thrown
-          for (const retryObj in this.retries.reverse()) {
+          for (const retryObj of retryRules) {
             if (!retryObj.when) return retry(err);
             if (retryObj.when && retryObj.when(err)) return retry(err);
           }
@@ -153,7 +158,7 @@ module.exports = {
     if (Number.isInteger(opts)) {
       opts = { retries: opts };
     }
-    return promise.then(() => this.retries.push(opts));
+    return this.add(() => this.retries.push(opts));
   },
 
   catch(customErrFn) {