seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Selenium] Adapt selenium tests from ocpoauth package (#13663)

7.20.x
Sergey Skorik 2019-07-02 11:56:00 +03:00 committed by GitHub
parent 47e59c2326
commit b2dff13147
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/site/ocpoauth/LoginExistedUserWithOpenShiftOAuthTest.java
View File

@ -22,11 +22,7 @@ import org.eclipse.che.selenium.core.TestGroup;
import org.eclipse.che.selenium.core.client.TestWorkspaceServiceClient;
import org.eclipse.che.selenium.core.provider.TestDashboardUrlProvider;
import org.eclipse.che.selenium.core.user.DefaultTestUser;
import org.eclipse.che.selenium.core.webdriver.SeleniumWebDriverHelper;
import org.eclipse.che.selenium.core.workspace.TestWorkspace;
import org.eclipse.che.selenium.core.workspace.TestWorkspaceProvider;
import org.eclipse.che.selenium.pageobject.Ide;
import org.eclipse.che.selenium.pageobject.ToastLoader;
import org.eclipse.che.selenium.pageobject.dashboard.Dashboard;
import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace;
import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace.Stack;
@ -36,6 +32,7 @@ import org.eclipse.che.selenium.pageobject.ocp.OpenShiftLoginPage;
import org.eclipse.che.selenium.pageobject.ocp.OpenShiftProjectCatalogPage;
import org.eclipse.che.selenium.pageobject.site.CheLoginPage;
import org.eclipse.che.selenium.pageobject.site.FirstBrokerProfilePage;
import org.eclipse.che.selenium.pageobject.theia.TheiaIde;
import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
@ -88,13 +85,10 @@ public class LoginExistedUserWithOpenShiftOAuthTest {
@Inject private Workspaces workspaces;
@Inject private NewWorkspace newWorkspace;
@Inject private TestWorkspaceServiceClient defaultUserWorkspaceServiceClient;
@Inject private ToastLoader toastLoader;
@Inject private Ide ide;
@Inject private SeleniumWebDriverHelper seleniumWebDriverHelper;
@Inject private OpenShiftProjectCatalogPage openShiftProjectCatalogPage;
@Inject private SeleniumWebDriver seleniumWebDriver;
@Inject private TestDashboardUrlProvider testDashboardUrlProvider;
@Inject private TestWorkspaceProvider testWorkspaceProvider;
@Inject private TheiaIde theiaIde;
// it is used to read workspace logs on test failure
private TestWorkspace testWorkspace;
@ -140,14 +134,13 @@ public class LoginExistedUserWithOpenShiftOAuthTest {
dashboard.selectWorkspacesItemOnDashboard();
workspaces.clickOnAddWorkspaceBtn();
newWorkspace.waitToolbar();
newWorkspace.selectStack(Stack.JAVA_MAVEN);
newWorkspace.typeWorkspaceName(WORKSPACE_NAME);
newWorkspace.selectStack(Stack.JAVA_MAVEN);
newWorkspace.clickOnCreateButtonAndOpenInIDE();
// switch to the Eclipse Che IDE and wait until workspace is ready to use
seleniumWebDriverHelper.switchToIdeFrameAndWaitAvailability();
toastLoader.waitToastLoaderAndClickStartButton();
ide.waitOpenedWorkspaceIsReadyToUse();
// switch to the IDE and wait for workspace is ready to use
theiaIde.switchToIdeFrame();
theiaIde.waitTheiaIde();
// go to OCP and check if there is a project with name equals to test workspace id
openShiftProjectCatalogPage.open();

19
selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/site/ocpoauth/LoginNewUserWithOpenShiftOAuthTest.java
View File

@ -23,11 +23,7 @@ import org.eclipse.che.selenium.core.TestGroup;
import org.eclipse.che.selenium.core.client.TestUserServiceClient;
import org.eclipse.che.selenium.core.provider.TestDashboardUrlProvider;
import org.eclipse.che.selenium.core.user.TestUser;
import org.eclipse.che.selenium.core.webdriver.SeleniumWebDriverHelper;
import org.eclipse.che.selenium.core.workspace.TestWorkspace;
import org.eclipse.che.selenium.core.workspace.TestWorkspaceProvider;
import org.eclipse.che.selenium.pageobject.Ide;
import org.eclipse.che.selenium.pageobject.ToastLoader;
import org.eclipse.che.selenium.pageobject.dashboard.Dashboard;
import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace;
import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace.Stack;
@ -37,6 +33,7 @@ import org.eclipse.che.selenium.pageobject.ocp.OpenShiftLoginPage;
import org.eclipse.che.selenium.pageobject.ocp.OpenShiftProjectCatalogPage;
import org.eclipse.che.selenium.pageobject.site.CheLoginPage;
import org.eclipse.che.selenium.pageobject.site.FirstBrokerProfilePage;
import org.eclipse.che.selenium.pageobject.theia.TheiaIde;
import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
@ -81,14 +78,11 @@ public class LoginNewUserWithOpenShiftOAuthTest {
@Inject private Dashboard dashboard;
@Inject private Workspaces workspaces;
@Inject private NewWorkspace newWorkspace;
@Inject private ToastLoader toastLoader;
@Inject private Ide ide;
@Inject private SeleniumWebDriverHelper seleniumWebDriverHelper;
@Inject private TestUserServiceClient testUserServiceClient;
@Inject private OpenShiftProjectCatalogPage openShiftProjectCatalogPage;
@Inject private SeleniumWebDriver seleniumWebDriver;
@Inject private TestDashboardUrlProvider testDashboardUrlProvider;
@Inject private TestWorkspaceProvider testWorkspaceProvider;
@Inject private TheiaIde theiaIde;
// it is used to read workspace logs on test failure
private TestWorkspace testWorkspace;
@ -126,14 +120,13 @@ public class LoginNewUserWithOpenShiftOAuthTest {
dashboard.selectWorkspacesItemOnDashboard();
workspaces.clickOnAddWorkspaceBtn();
newWorkspace.waitToolbar();
newWorkspace.selectStack(Stack.JAVA_MAVEN);
newWorkspace.typeWorkspaceName(WORKSPACE_NAME);
newWorkspace.selectStack(Stack.JAVA_MAVEN);
newWorkspace.clickOnCreateButtonAndOpenInIDE();
// switch to the Eclipse Che IDE and wait until workspace is ready to use
seleniumWebDriverHelper.switchToIdeFrameAndWaitAvailability();
toastLoader.waitToastLoaderAndClickStartButton();
ide.waitOpenedWorkspaceIsReadyToUse();
// switch to the IDE and wait for workspace is ready to use
theiaIde.switchToIdeFrame();
theiaIde.waitTheiaIde();
// go to OCP and check if there is a project with name starts from "workspace"
openShiftProjectCatalogPage.open();