Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Selenium] Fix unstable selenium tests from dashboard package #14571

Merged
merged 8 commits into from
Sep 18, 2019
Merged

[Selenium] Fix unstable selenium tests from dashboard package #14571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8a38454
type workspace name before devfile selection
SkorikSergey Sep 17, 2019
b6da0f2
Merge branch 'master' of https://github.com/eclipse/che into fixUnsta…
SkorikSergey Sep 17, 2019
dea9dfc
remove unused method
SkorikSergey Sep 17, 2019
b324e77
wait for 'finished cloning projects' notification disappearance
SkorikSergey Sep 17, 2019
04885f1
increase timeout for checking notification disappearance
SkorikSergey Sep 17, 2019
95da95a
Merge branch 'master' of https://github.com/eclipse/che into fixUnsta…
SkorikSergey Sep 17, 2019
ad5e703
check that devfile was selected properly from devfiles list
SkorikSergey Sep 17, 2019
c696347
changes according to review
SkorikSergey Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...lenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/NewWorkspace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.eclipse.che.selenium.core.webdriver.WebDriverWaitFactory;
import org.eclipse.che.selenium.pageobject.TestWebElementRenderChecker;
import org.openqa.selenium.By;
import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
import org.openqa.selenium.support.PageFactory;
Expand Down Expand Up @@ -185,7 +186,12 @@ public boolean isDevfileVisible(Devfile devfile) {

public void selectDevfile(Devfile devfile) {
waitDevfiles(asList(devfile));
seleniumWebDriverHelper.waitAndClick(By.xpath(format(DEVFILE_ROW_XPATH, devfile.getId())));
try {
seleniumWebDriverHelper.waitAndClick(By.xpath(format(DEVFILE_ROW_XPATH, devfile.getId())));
waitDevfileSelected(devfile);
} catch (TimeoutException ex) {
seleniumWebDriverHelper.waitAndClick(By.xpath(format(DEVFILE_ROW_XPATH, devfile.getId())));
}
}

public boolean isCreateWorkspaceButtonEnabled() {
Expand Down
8 changes: 7 additions & 1 deletion ...m/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/theia/TheiaIde.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.eclipse.che.selenium.core.utils.WaitUtils;
import org.eclipse.che.selenium.core.webdriver.SeleniumWebDriverHelper;
import org.openqa.selenium.By;
import org.openqa.selenium.TimeoutException;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
import org.openqa.selenium.support.PageFactory;
Expand Down Expand Up @@ -151,7 +152,12 @@ public void waitNotificationPanelClosed() {
}

public void waitTheiaIde() {
seleniumWebDriverHelper.waitVisibility(theiaIde, PREPARING_WS_TIMEOUT_SEC);
try {
seleniumWebDriverHelper.waitVisibility(theiaIde, PREPARING_WS_TIMEOUT_SEC);
} catch (TimeoutException ex) {
switchToIdeFrame();
seleniumWebDriverHelper.waitVisibility(theiaIde, PREPARING_WS_TIMEOUT_SEC);
}
}

public void waitTheiaIdeTopPanel() {
Expand Down
3 changes: 2 additions & 1 deletion ...um-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ public void createProjectTest() {
dashboardWindow = seleniumWebDriver.getWindowHandle();

// we are selecting 'Java' stack from the 'All Devfile' tab for compatibility with OSIO
newWorkspace.selectDevfile(Devfile.JAVA_MAVEN);
newWorkspace.typeWorkspaceName(WORKSPACE);
newWorkspace.selectDevfile(Devfile.JAVA_MAVEN);
newWorkspace.waitDevfileSelected(Devfile.JAVA_MAVEN);
projectSourcePage.waitCreatedProjectButton(CONSOLE_JAVA_SIMPLE);

// create 'console-java-simple-1' project
Expand Down
1 change: 1 addition & 0 deletions ...e-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateWorkspaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public void checkWorkspaceName() {
public void checkProjectSourcePage() {
// add a project from the 'console-java-simple' sample
newWorkspace.selectDevfile(Devfile.JAVA_MAVEN);
newWorkspace.waitDevfileSelected(Devfile.JAVA_MAVEN);
projectSourcePage.waitOpened();
projectSourcePage.waitCreatedProjectButton(projectName);

Expand Down
3 changes: 2 additions & 1 deletion ...-test/src/test/java/org/eclipse/che/selenium/dashboard/ImportMavenProjectFromGitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ public void checkAbilityImportMavenProjectTest() {
workspaces.clickOnAddWorkspaceBtn();
newWorkspace.waitToolbar();

newWorkspace.typeWorkspaceName(WORKSPACE);
// we are selecting 'Java' stack from the 'All Devfile' tab for compatibility with OSIO
newWorkspace.selectDevfile(Devfile.JAVA_MAVEN);
newWorkspace.typeWorkspaceName(WORKSPACE);
newWorkspace.waitDevfileSelected(Devfile.JAVA_MAVEN);

projectSourcePage.clickOnAddOrImportProjectButton();

Expand Down
3 changes: 2 additions & 1 deletion ...um-test/src/test/java/org/eclipse/che/selenium/dashboard/ImportProjectFromGitHubTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,10 @@ public void checkAbilityImportProjectFromGithub() {
dashboard.selectWorkspacesItemOnDashboard();
workspaces.clickOnAddWorkspaceBtn();
newWorkspace.waitToolbar();
newWorkspace.typeWorkspaceName(WORKSPACE);
// we are selecting 'Java' stack from the 'All Devfile' tab for compatibility with OSIO
newWorkspace.selectDevfile(Devfile.JAVA_MAVEN);
newWorkspace.typeWorkspaceName(WORKSPACE);
newWorkspace.waitDevfileSelected(Devfile.JAVA_MAVEN);

projectSourcePage.clickOnAddOrImportProjectButton();
projectSourcePage.selectSourceTab(GITHUB);
Expand Down
3 changes: 2 additions & 1 deletion .../java/org/eclipse/che/selenium/dashboard/organization/AddWorkspaceToOrganizationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,9 @@ private void createWorkspace(String organizationName, String workspaceName) {
newWorkspace.waitToolbar();
newWorkspace.openOrganizationsList();
newWorkspace.selectOrganizationFromList(organizationName);
newWorkspace.selectDevfile(Devfile.JAVA_MAVEN);
newWorkspace.typeWorkspaceName(workspaceName);
newWorkspace.selectDevfile(Devfile.JAVA_MAVEN);
newWorkspace.waitDevfileSelected(Devfile.JAVA_MAVEN);
newWorkspace.clickOnCreateButtonAndEditWorkspace();
workspaceDetails.waitToolbarTitleName(workspaceName);
}
Expand Down
3 changes: 2 additions & 1 deletion ...rc/test/java/org/eclipse/che/selenium/dashboard/organization/ShareWorkspaceOwnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,9 @@ private void createWorkspace(String organizationName, String workspaceName) {
newWorkspace.waitToolbar();
newWorkspace.openOrganizationsList();
newWorkspace.selectOrganizationFromList(organizationName);
newWorkspace.selectDevfile(Devfile.JAVA_MAVEN);
newWorkspace.typeWorkspaceName(workspaceName);
newWorkspace.selectDevfile(Devfile.JAVA_MAVEN);
newWorkspace.waitDevfileSelected(Devfile.JAVA_MAVEN);
newWorkspace.clickOnCreateButtonAndEditWorkspace();
workspaceDetails.waitToolbarTitleName(workspaceName);
}
Expand Down
1 change: 0 additions & 1 deletion ...src/test/java/org/eclipse/che/selenium/factory/DirectUrlFactoryWithKeepDirectoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ public void factoryWithDirectUrlWithKeepDirectory() {
theiaIde.switchToIdeFrame();
theiaIde.waitTheiaIde();
theiaIde.waitLoaderInvisibility();
theiaIde.waitNotificationEqualsTo("Che Workspace: Finished cloning projects.");
theiaIde.waitNotificationDisappearance(
"Che Workspace: Finished cloning projects.", UPDATING_PROJECT_TIMEOUT_SEC);

Expand Down
1 change: 0 additions & 1 deletion ...st/src/test/java/org/eclipse/che/selenium/factory/DirectUrlFactoryWithRootFolderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ public void factoryWithDirectUrlWithRootFolder() {
theiaIde.switchToIdeFrame();
theiaIde.waitTheiaIde();
theiaIde.waitLoaderInvisibility();
theiaIde.waitNotificationEqualsTo("Che Workspace: Finished cloning projects.");
theiaIde.waitNotificationDisappearance(
"Che Workspace: Finished cloning projects.", UPDATING_PROJECT_TIMEOUT_SEC);

Expand Down
1 change: 0 additions & 1 deletion ...rc/test/java/org/eclipse/che/selenium/factory/DirectUrlFactoryWithSpecificBranchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ public void factoryWithDirectUrlWithSpecificBranch() {
theiaIde.switchToIdeFrame();
theiaIde.waitTheiaIde();
theiaIde.waitLoaderInvisibility();
theiaIde.waitNotificationEqualsTo("Che Workspace: Finished cloning projects.");
theiaIde.waitNotificationDisappearance(
"Che Workspace: Finished cloning projects.", UPDATING_PROJECT_TIMEOUT_SEC);

Expand Down