Merge pull request #3367 from cloudfoundry-incubator/more-tolerant-service-e2e

Allow e2e createService helper 3 attempts at creating a service

Author: nwmac

src/test-e2e/marketplace/services-helper-e2e.ts

@@ -1,4 +1,4 @@
-import { browser, promise } from 'protractor';
+import { browser, promise, protractor } from 'protractor';
 
 import { CFResponse, createEmptyCfResponse } from '../../frontend/app/store/types/api.types';
 import { e2e, E2ESetup } from '../e2e';
@@ -9,6 +9,7 @@ import { ListComponent } from '../po/list.po';
 import { CreateServiceInstance } from './create-service-instance.po';
 
 const customServiceLabel = E2EHelpers.e2eItemPrefix + process.env.USER;
+const until = protractor.ExpectedConditions;
 
 export class ServicesHelperE2E {
 
@@ -92,9 +93,32 @@ export class ServicesHelperE2E {
 
       this.setServiceInstanceDetail();
 
-      this.createServiceInstance.stepper.next();
+      this.createInstanceAttempt(0, 3, serviceName);
+    });
+  }
+
+  createInstanceAttempt = (retryNumber: number, maxRetries: number, serviceName: string) => {
+    this.createServiceInstance.stepper.next();
+    browser.wait(until.or(
+      until.invisibilityOf(this.createServiceInstance.stepper.nextButton()),
+      this.createServiceInstance.stepper.canNext.bind(this.createServiceInstance.stepper)
+    ), 10000);
+
+    this.createServiceInstance.stepper.canNext().then(canNext => {
+      if (canNext) {
+        const attemptsLeft = maxRetries - retryNumber;
+        if (!!attemptsLeft) {
+          e2e.log(`Failed to create service instance '${this.serviceInstanceName}' of type '${serviceName}'.
+           Attempting ${attemptsLeft} more time/s`);
+          browser.sleep(1000);
+          this.createInstanceAttempt(retryNumber + 1, maxRetries, serviceName);
+        } else {
+          fail(`Failed to create service instance after ${maxRetries} retries`);
+        }
+      }
     });
   }
+
   canBindAppStep = (): promise.Promise<boolean> => {
     return this.cfHelper.fetchDefaultSpaceGuid(true)
       .then(spaceGuid => this.cfHelper.fetchAppsCountInSpace(CFHelpers.cachedDefaultCfGuid, spaceGuid))

src/test-e2e/po/stepper.po.ts

@@ -1,5 +1,6 @@
-import { by, element, browser, protractor, promise } from 'protractor';
+import { browser, by, element, promise, protractor } from 'protractor';
 import { ElementFinder } from 'protractor/built';
+
 import { Component } from './component.po';
 import { FormComponent } from './form.po';
 
@@ -22,8 +23,12 @@ export class StepperComponent extends Component {
     super(locator);
   }
 
+  nextButton(): ElementFinder {
+    return this.locator.element(by.id('stepper_next'));
+  }
+
   next() {
-    return this.locator.element(by.id('stepper_next')).click();
+    return this.nextButton().click();
   }
 
   cancel() {