Merge pull request #6434 from eclipse/fixUnstableTestsFromDashboardPa…

…ckage Fix unstable selenium tests from dashboard package
eclipse-che · Sep 26, 2017 · b27fd0e · b27fd0e
2 parents 837cf28 + 93a19ab
commit b27fd0e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...um-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java b/...um-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java
@@ -20,6 +20,8 @@
 import org.eclipse.che.selenium.core.constant.TestStacksConstants;
 import org.eclipse.che.selenium.core.user.DefaultTestUser;
 import org.eclipse.che.selenium.pageobject.Loader;
+import org.eclipse.che.selenium.pageobject.MavenPluginStatusBar;
+import org.eclipse.che.selenium.pageobject.NotificationsPopupPanel;
 import org.eclipse.che.selenium.pageobject.ProjectExplorer;
 import org.eclipse.che.selenium.pageobject.dashboard.CreateWorkspace;
 import org.eclipse.che.selenium.pageobject.dashboard.Dashboard;
@@ -47,6 +49,8 @@ public class CreateAndDeleteProjectsTest {
   @Inject private SeleniumWebDriver seleniumWebDriver;
   @Inject private TestWorkspaceServiceClient workspaceServiceClient;
   @Inject private DefaultTestUser defaultTestUser;
+  @Inject private NotificationsPopupPanel notificationsPopupPanel;
+  @Inject private MavenPluginStatusBar mavenPluginStatusBar;
 
   @BeforeClass
   public void setUp() {
@@ -85,6 +89,8 @@ public void createAndDeleteProjectTest() throws ExecutionException, InterruptedE
         DashboardProject.Template.CONSOLE_JAVA_SIMPLE.value(), PROJECT_FOLDER);
     explorer.waitFolderDefinedTypeOfFolderByPath(
         DashboardProject.Template.WEB_JAVA_SPRING.value(), PROJECT_FOLDER);
+    notificationsPopupPanel.waitPopUpPanelsIsClosed();
+    mavenPluginStatusBar.waitClosingInfoPanel();
     switchToWindow(dashboardWindow);
     dashboard.selectWorkspacesItemOnDashboard();
 

diff --git a/...e-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/RenameWorkspaceTest.java b/...e-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/RenameWorkspaceTest.java
@@ -17,6 +17,7 @@
 import org.eclipse.che.selenium.core.workspace.TestWorkspace;
 import org.eclipse.che.selenium.pageobject.dashboard.Dashboard;
 import org.eclipse.che.selenium.pageobject.dashboard.DashboardWorkspace;
+import org.eclipse.che.selenium.pageobject.dashboard.DashboardWorkspace.StateWorkspace;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -53,6 +54,9 @@ public void renameNameWorkspaceTest() {
     dashboardWorkspace.selectTabInWorspaceMenu(DashboardWorkspace.TabNames.OVERVIEW);
     dashboardWorkspace.enterNameWorkspace(CHANGE_WORKSPACE_NAME);
     dashboardWorkspace.clickOnSaveBtn();
+    dashboardWorkspace.checkStateOfWorkspace(StateWorkspace.STOPPING);
+    dashboardWorkspace.checkStateOfWorkspace(StateWorkspace.STARTING);
+    dashboardWorkspace.checkStateOfWorkspace(StateWorkspace.RUNNING);
     dashboard.waitNotificationMessage("Workspace updated");
     dashboard.waitNotificationIsClosed();
     dashboardWorkspace.checkNameWorkspace(CHANGE_WORKSPACE_NAME);