Merge pull request cdapio#292 from cloudsufi/pageLoadTimeoutFix

Updating timeouts and data-testid

Author: AnkitCLI

src/main/java/io/cdap/e2e/pages/actions/CdfStudioActions.java

@@ -105,6 +105,7 @@ public static void selectRealtimeSourcePlugin(String pluginName) {
    */
   public static void verifyPluginNodeIsDisplayedOnCanvas(String pluginName, long timeoutInSeconds) {
     logger.info("Waiting for plugin : " + pluginName + " node to displayed on the canvas");
+    WaitHelper.waitForPageToLoad();
     WaitHelper.waitForElementToBeDisplayed(CdfStudioLocators.locatePluginNodeInCanvas(pluginName), timeoutInSeconds);
     AssertionHelper.verifyElementDisplayed(CdfStudioLocators.locatePluginNodeInCanvas(pluginName)
       , "Plugin : " + pluginName + " node should be displayed on the canvas");
@@ -294,6 +295,7 @@ public static void verifyPipelinePreviewStatusInLogs(String status) {
    * Click on the Deploy button
    */
   public static void pipelineDeploy() {
+    WaitHelper.waitForPageToLoad();
     ElementHelper.clickOnElement(CdfStudioLocators.pipelineDeploy);
     WaitHelper.waitForElementToBeDisplayed(CdfStudioLocators.deployingPipelineMessage);
     WaitHelper.waitForElementToBeHidden(
@@ -533,6 +535,7 @@ public static void importPipeline(String filePath) throws URISyntaxException {
     WaitHelper.waitForElementToBeDisplayed(CdfStudioLocators.importPipelineButton);
     FileImportUtil.uploadFile(CdfStudioLocators.importPipelineInputTag(), filePath);
     clickOnFixAllButtonIfDisplayed();
+    WaitHelper.waitForPageToLoad();
   }
 
   /**

src/main/java/io/cdap/e2e/pages/locators/CdfStudioLocators.java

@@ -185,19 +185,19 @@ public static WebElement locatePluginGroupCollapsed(String pluginGroupName) {
   }
 
   public static WebElement locatePluginNameInList(String pluginName, String  pluginGroupName) {
-    String xpath = "//div[@data-cy='plugin-" + pluginGroupName + "-group']" +
+    String xpath = "//div[@data-testid='plugin-" + pluginGroupName + "-group']" +
       "//div[contains(@class, 'PluginNameContainer')][normalize-space(text()) = '" + pluginName + "' " +
       "or translate(normalize-space(text()),' ','') = '" + pluginName + "']";
     return SeleniumDriver.getDriver().findElement(By.xpath(xpath));
   }
 
   public static WebElement locateSinkPluginNameInList(String pluginName) {
-    String xpath = "//*[@data-cy='plugin-" + pluginName + "-batchsink']";
+    String xpath = "//*[@data-testid='plugin-" + pluginName + "-batchsink']";
     return SeleniumDriver.getDriver().findElement(By.xpath(xpath));
   }
 
   public static WebElement locateRealtimeSourcePluginNameInList(String pluginName) {
-    String xpath = "//*[@data-cy='plugin-" + pluginName + "-streamingsource']";
+    String xpath = "//*[@data-testid='plugin-" + pluginName + "-streamingsource']";
     return SeleniumDriver.getDriver().findElement(By.xpath(xpath));
   }
 

src/main/java/io/cdap/e2e/utils/ConstantsUtil.java

@@ -87,11 +87,11 @@ public class ConstantsUtil {
   /**
    * PAGE_LOAD_TIMEOUT_SECONDS: To be used as Selenium driver's default page load timeout
    */
-  public static final int PAGE_LOAD_TIMEOUT_SECONDS = 50;
+  public static final int PAGE_LOAD_TIMEOUT_SECONDS = 300;
   /**
    * SMALL_TIMEOUT_SECONDS: To be used as a small static wait (only if needed)
    */
-  public static final int SMALL_TIMEOUT_SECONDS = 5;
+  public static final int SMALL_TIMEOUT_SECONDS = 20;
   /**
    * MEDIUM_TIMEOUT_SECONDS: To be used as a medium static wait (only if needed)
    */

src/main/java/stepsdesign/PipelineSteps.java

@@ -25,6 +25,7 @@
 import io.cdap.e2e.utils.ConstantsUtil;
 import io.cdap.e2e.utils.PluginPropertyUtils;
 import io.cdap.e2e.utils.SeleniumHelper;
+import io.cdap.e2e.utils.WaitHelper;
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
@@ -89,6 +90,7 @@ public void expandPluginGroup(String pluginGroup) {
   @When("Select plugin: {string} from the plugins list as: {string}")
   public void selectPlugin(String pluginName, String pluginGroupName) {
     logger.info("Click on plugin: " + pluginName + " from the Plugin group: " + pluginGroupName);
+    WaitHelper.waitForPageToLoad();
     CdfStudioActions.selectPluginFromList(pluginName, pluginGroupName);
   }
 
@@ -109,6 +111,7 @@ public void verifyPluginNodeIsDisplayedOnTheCanvas(String pluginName, long timeo
 
   @When("Navigate to the properties page of plugin: {string}")
   public void navigateToPluginPropertiesPage(String pluginName) {
+    WaitHelper.waitForPageToLoad();
     CdfStudioActions.navigateToPluginPropertiesPage(pluginName);
   }