Fix project path in some test related to Factory feature (eclipse-che#6418)

* Fix project path in some test related to Factory feature

Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>

Author: vparfonov

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/factory/CheckFactoryWithMultiModuleTest.java

@@ -51,7 +51,7 @@ public void setUp() throws Exception {
         testFactoryInitializer.fromTemplate(FactoryTemplate.MINIMAL);
     ProjectConfigDto projectConfigDto = factoryBuilder.getWorkspace().getProjects().get(0);
     projectConfigDto.setName(PROJECT_NAME);
-    projectConfigDto.setPath(PROJECT_NAME);
+    projectConfigDto.setPath("/" + PROJECT_NAME);
     projectConfigDto.getSource().setParameters(ImmutableMap.of("branch", "master"));
     projectConfigDto
         .getSource()

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/factory/CheckFactoryWithPerUserCreatePolicyTest.java

@@ -19,7 +19,6 @@
 import org.eclipse.che.selenium.core.factory.FactoryTemplate;
 import org.eclipse.che.selenium.core.factory.TestFactory;
 import org.eclipse.che.selenium.core.factory.TestFactoryInitializer;
-import org.eclipse.che.selenium.pageobject.Ide;
 import org.eclipse.che.selenium.pageobject.NotificationsPopupPanel;
 import org.eclipse.che.selenium.pageobject.ProjectExplorer;
 import org.eclipse.che.selenium.pageobject.dashboard.Dashboard;
@@ -29,7 +28,6 @@
 
 /** @author Mihail Kuznyetsov */
 public class CheckFactoryWithPerUserCreatePolicyTest {
-  @Inject private Ide ide;
   @Inject private ProjectExplorer projectExplorer;
   @Inject private Dashboard dashboard;
   @Inject private NotificationsPopupPanel notificationsPopupPanel;
@@ -56,21 +54,21 @@ public void checkFactoryAcceptingWithPerUserPolicy() throws Exception {
     dashboard.open();
 
     // accept factory
-    testFactory.open(ide.driver());
+    testFactory.open(seleniumWebDriver);
 
     seleniumWebDriver.switchFromDashboardIframeToIde();
     projectExplorer.waitProjectExplorer();
     notificationsPopupPanel.waitExpectedMessageOnProgressPanelAndClosed("Project Spring imported");
 
-    String workspaceUrl = ide.driver().getCurrentUrl();
+    String workspaceUrl = seleniumWebDriver.getCurrentUrl();
 
     // accept factory
-    testFactory.open(ide.driver());
+    testFactory.open(seleniumWebDriver);
 
     seleniumWebDriver.switchFromDashboardIframeToIde();
     projectExplorer.waitProjectExplorer();
 
     // factory has been accepted in the same workspace
-    assertEquals(workspaceUrl, ide.driver().getCurrentUrl());
+    assertEquals(workspaceUrl, seleniumWebDriver.getCurrentUrl());
   }
 }

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/factory/CheckFactoryWithSparseCheckoutTest.java

@@ -52,7 +52,7 @@ public void setUp() throws Exception {
         .getSource()
         .setLocation("https://github.com/" + gitHubUsername + "/" + PROJECT_NAME);
     projectConfig.setName(PROJECT_NAME);
-    projectConfig.setPath(PROJECT_NAME);
+    projectConfig.setPath("/" + PROJECT_NAME);
     testFactory = testFactoryBuilder.build();
   }
 

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/factory/CheckFactoryWithUntilPolicyTest.java

@@ -23,7 +23,6 @@
 import org.eclipse.che.selenium.core.factory.TestFactory;
 import org.eclipse.che.selenium.core.factory.TestFactoryInitializer;
 import org.eclipse.che.selenium.core.utils.WaitUtils;
-import org.eclipse.che.selenium.pageobject.Ide;
 import org.eclipse.che.selenium.pageobject.PopupDialogsBrowser;
 import org.eclipse.che.selenium.pageobject.ProjectExplorer;
 import org.eclipse.che.selenium.pageobject.dashboard.Dashboard;
@@ -43,7 +42,6 @@ public class CheckFactoryWithUntilPolicyTest {
 
   @Inject private ProjectExplorer projectExplorer;
   @Inject private TestFactoryInitializer testFactoryInitializer;
-  @Inject private Ide ide;
   @Inject private PopupDialogsBrowser popupDialogsBrowser;
   @Inject private Dashboard dashboard;
   @Inject private SeleniumWebDriver seleniumWebDriver;
@@ -69,7 +67,7 @@ public void tearDown() throws Exception {
   public void checkFactoryAcceptingWithUntilPolicy() throws Exception {
     // first
     dashboard.open();
-    testFactory.open(ide.driver());
+    testFactory.open(seleniumWebDriver);
     seleniumWebDriver.switchFromDashboardIframeToIde();
     projectExplorer.waitProjectExplorer();
     while (System.currentTimeMillis() <= INIT_TIME + ADDITIONAL_TIME) {
@@ -81,12 +79,12 @@ public void checkFactoryAcceptingWithUntilPolicy() throws Exception {
     }
 
     // second
-    testFactory.open(ide.driver());
-    new WebDriverWait(ide.driver(), PREPARING_WS_TIMEOUT_SEC)
+    testFactory.open(seleniumWebDriver);
+    new WebDriverWait(seleniumWebDriver, PREPARING_WS_TIMEOUT_SEC)
         .until(ExpectedConditions.alertIsPresent());
     assertTrue(
-        ide.driver().switchTo().alert().getText().contains(ALERT_EXPIRE_MESSAGE),
-        "actual message: " + ide.driver().switchTo().alert().getText());
+        seleniumWebDriver.switchTo().alert().getText().contains(ALERT_EXPIRE_MESSAGE),
+        "actual message: " + seleniumWebDriver.switchTo().alert().getText());
     popupDialogsBrowser.acceptAlert();
   }
 }