From 89977e36054af381629aeb3f6a3606828ad9dd0c Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 9 May 2016 19:47:42 +0200
Subject: [PATCH] no-jira: hardened some selenium methods
---
src/test/java/org/olat/selenium/page/LoginPage.java | 5 ++++-
src/test/java/org/olat/selenium/page/NavigationPage.java | 3 +++
.../olat/selenium/page/repository/CatalogAdminPage.java | 9 ++++-----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/test/java/org/olat/selenium/page/LoginPage.java b/src/test/java/org/olat/selenium/page/LoginPage.java
index a7758940d50..950816af7c5 100644
--- a/src/test/java/org/olat/selenium/page/LoginPage.java
+++ b/src/test/java/org/olat/selenium/page/LoginPage.java
@@ -89,6 +89,7 @@ public class LoginPage {
}
public void assertLoggedInByLastName(String lastName) {
+ OOGraphene.waitElement(usernameFooterBy, 5, browser);
WebElement username = browser.findElement(usernameFooterBy);
Assert.assertNotNull(username);
Assert.assertTrue(username.isDisplayed());
@@ -170,8 +171,10 @@ public class LoginPage {
WebElement acknowledgeButton = browser.findElement(disclaimerButtonXPath);
Graphene.guardHttp(acknowledgeButton).click();
- OOGraphene.waitElement(authXPath, browser);
}
+
+ //wait until the content appears
+ OOGraphene.waitElement(authXPath, browser);
return this;
}
diff --git a/src/test/java/org/olat/selenium/page/NavigationPage.java b/src/test/java/org/olat/selenium/page/NavigationPage.java
index 37d5d077b4b..9035a79dcd9 100644
--- a/src/test/java/org/olat/selenium/page/NavigationPage.java
+++ b/src/test/java/org/olat/selenium/page/NavigationPage.java
@@ -159,6 +159,9 @@ public class NavigationPage {
List<WebElement> openMoreLinks = browser.findElements(openMoreBy);
Assert.assertFalse(openMoreLinks.isEmpty());
openMoreLinks.get(0).click();
+ //wait the small transition
+ By openedMoreMenuby = By.cssSelector("#o_navbar_more ul.dropdown-menu.dropdown-menu-right");
+ OOGraphene.waitElement(openedMoreMenuby, 5, browser);
}
public NavigationPage backToTheTop() {
diff --git a/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java b/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
index 379aa130604..85a8c8e0753 100644
--- a/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
+++ b/src/test/java/org/olat/selenium/page/repository/CatalogAdminPage.java
@@ -58,15 +58,14 @@ public class CatalogAdminPage {
public CatalogAdminPage addCatalogNode(String title, String description) {
//click in toolbox
By addNodeBy = By.className("o_sel_catalog_add_category");
- WebElement addNodeLink = browser.findElement(addNodeBy);
- addNodeLink.click();
- OOGraphene.waitingALittleBit();
+ browser.findElement(addNodeBy).click();
+ OOGraphene.waitBusy(browser);
+ OOGraphene.waitModalDialog(browser);
//fill the form
By titleBy = By.cssSelector(".o_sel_catalog_add_category_popup input[type='text']");
OOGraphene.waitElement(titleBy, browser);
- WebElement titleEl = browser.findElement(titleBy);
- titleEl.sendKeys(title);
+ browser.findElement(titleBy).sendKeys(title);
OOGraphene.tinymce(description, browser);
--
GitLab