From 17379254db6b66433ec1d910ab76895426f16aff Mon Sep 17 00:00:00 2001
From: sskoryk <sskoryk@redhat.com>
Date: Wed, 15 Aug 2018 15:40:30 +0300
Subject: [PATCH 1/3] move unstable WorkspacesListTest selenium test to
 CheOneThreadTestsSuite

---
 .../src/test/resources/suites/CheOneThreadTestsSuite.xml         | 1 +
 .../che-selenium-test/src/test/resources/suites/CheSuite.xml     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/selenium/che-selenium-test/src/test/resources/suites/CheOneThreadTestsSuite.xml b/selenium/che-selenium-test/src/test/resources/suites/CheOneThreadTestsSuite.xml
index 81bbfa088d5..a444b3e26bd 100644
--- a/selenium/che-selenium-test/src/test/resources/suites/CheOneThreadTestsSuite.xml
+++ b/selenium/che-selenium-test/src/test/resources/suites/CheOneThreadTestsSuite.xml
@@ -65,6 +65,7 @@
             <class name="org.eclipse.che.selenium.git.PushingChangesTest"/>
             <class name="org.eclipse.che.selenium.dashboard.ImportProjectFromGitHubTest"/>
             <class name="org.eclipse.che.selenium.factory.DirectUrlFactoryWithKeepDirectoryTest"/>
+            <class name="org.eclipse.che.selenium.dashboard.workspaces.WorkspacesListTest"/>
         </classes>
     </test>
 </suite>
diff --git a/selenium/che-selenium-test/src/test/resources/suites/CheSuite.xml b/selenium/che-selenium-test/src/test/resources/suites/CheSuite.xml
index fad183c019f..c32299bd764 100644
--- a/selenium/che-selenium-test/src/test/resources/suites/CheSuite.xml
+++ b/selenium/che-selenium-test/src/test/resources/suites/CheSuite.xml
@@ -67,7 +67,6 @@
           <class name="org.eclipse.che.selenium.dashboard.workspaces.details.WorkspaceDetailsOverviewTest"/>
           <class name="org.eclipse.che.selenium.dashboard.workspaces.details.WorkspaceDetailsComposeTest"/>
           <class name="org.eclipse.che.selenium.dashboard.CreateWorkspaceTest"/>
-          <class name="org.eclipse.che.selenium.dashboard.workspaces.WorkspacesListTest"/>
           <class name="org.eclipse.che.selenium.dashboard.CreateFactoryTest"/>
           <class name="org.eclipse.che.selenium.dashboard.FactoriesListTest"/>
           <class name="org.eclipse.che.selenium.dashboard.workspaces.AddOrImportProjectFormTest"/>

From 8371ecd5009b0893f534c90d7ce432ae7e248e36 Mon Sep 17 00:00:00 2001
From: sskoryk <sskoryk@redhat.com>
Date: Wed, 15 Aug 2018 15:46:35 +0300
Subject: [PATCH 2/3] check that the Loader is closed after the Project
 Explorer is visibled

---
 .../org/eclipse/che/selenium/pageobject/ProjectExplorer.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/ProjectExplorer.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/ProjectExplorer.java
index b7bac26db78..7cdc773159e 100644
--- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/ProjectExplorer.java
+++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/ProjectExplorer.java
@@ -265,6 +265,7 @@ public void waitProjectExplorerDisappearance(int timeout) {
   public void waitProjectExplorer(int timeout) {
     try {
       seleniumWebDriverHelper.waitVisibility(By.id(PROJECT_EXPLORER_TREE_ITEMS), timeout);
+      loader.waitOnClosed();
     } catch (TimeoutException ex) {
       // remove try-catch block after issue has been resolved
       if (seleniumWebDriverHelper.isVisible(By.id("ide-loader-progress-bar"))) {

From 32ffa8971bdb64a61cf4af66ad307ebeff74b9e8 Mon Sep 17 00:00:00 2001
From: sskoryk <sskoryk@redhat.com>
Date: Wed, 15 Aug 2018 16:31:49 +0300
Subject: [PATCH 3/3] add info about known issue in Refactor selenium page
 object

---
 .../org/eclipse/che/selenium/pageobject/Refactor.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Refactor.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Refactor.java
index 5bcb07df843..2e6d9998506 100644
--- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Refactor.java
+++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Refactor.java
@@ -45,12 +45,14 @@
 import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf;
 import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfAllElementsLocatedBy;
 import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
+import static org.testng.Assert.fail;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import org.eclipse.che.selenium.core.SeleniumWebDriver;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.PageFactory;
@@ -235,7 +237,12 @@ public void waitRenameMethodFormIsOpen() {
 
   /** wait the 'Rename Method' form is closed */
   public void waitRenameMethodFormIsClosed() {
-    elementWait.until(invisibilityOfElementLocated(By.xpath(RENAME_METHOD_FORM)));
+    try {
+      elementWait.until(invisibilityOfElementLocated(By.xpath(RENAME_METHOD_FORM)));
+    } catch (TimeoutException ex) {
+      // remove try-catch block after issue has been resolved
+      fail("Known issue: https://github.com/eclipse/che/issues/10784", ex);
+    }
   }
 
   /** wait the 'Rename Field' form is open */