From ee3bf8918198c09502e3d10cb67b632bf8d89193 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 11 Dec 2015 08:27:09 +0100
Subject: [PATCH] no-jira: more wati based on web elements and not the busy
flag
---
.../java/org/olat/selenium/page/core/MenuTreePageFragment.java | 2 +-
.../java/org/olat/selenium/page/course/CoursePageFragment.java | 1 +
src/test/java/org/olat/selenium/page/repository/CPPage.java | 3 ++-
src/test/java/org/olat/selenium/page/wiki/WikiPage.java | 3 ++-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java b/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java
index 0199be1b4b3..68c3bd954ab 100644
--- a/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java
+++ b/src/test/java/org/olat/selenium/page/core/MenuTreePageFragment.java
@@ -37,7 +37,7 @@ import org.openqa.selenium.WebElement;
*/
public class MenuTreePageFragment {
- private static final By treeBy = By.className("o_tree");
+ public static final By treeBy = By.className("o_tree");
private final WebDriver browser;
diff --git a/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java b/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
index d3d2f75f2dc..7e8372c487b 100644
--- a/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
+++ b/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
@@ -124,6 +124,7 @@ public class CoursePageFragment {
* @return
*/
public MenuTreePageFragment clickTree() {
+ OOGraphene.waitElement(MenuTreePageFragment.treeBy, 2, browser);
MenuTreePageFragment menuTree = new MenuTreePageFragment(browser);
menuTree.selectRoot();
return menuTree;
diff --git a/src/test/java/org/olat/selenium/page/repository/CPPage.java b/src/test/java/org/olat/selenium/page/repository/CPPage.java
index 61bd1eb6cbc..56ebf8b1f04 100644
--- a/src/test/java/org/olat/selenium/page/repository/CPPage.java
+++ b/src/test/java/org/olat/selenium/page/repository/CPPage.java
@@ -46,7 +46,8 @@ public class CPPage {
}
public CPPage assertInIFrame(By by) {
- By iframeBy = By.xpath("//iframe");
+ By iframeBy = By.xpath("//div[contains(@class,'o_iframedisplay')]//iframe");
+ OOGraphene.waitElement(iframeBy, 2, browser);
List<WebElement> iframes = browser.findElements(iframeBy);
browser = browser.switchTo().frame(iframes.get(0));
diff --git a/src/test/java/org/olat/selenium/page/wiki/WikiPage.java b/src/test/java/org/olat/selenium/page/wiki/WikiPage.java
index aff212c345d..86310d1a1f0 100644
--- a/src/test/java/org/olat/selenium/page/wiki/WikiPage.java
+++ b/src/test/java/org/olat/selenium/page/wiki/WikiPage.java
@@ -67,12 +67,13 @@ public class WikiPage {
public WikiPage createPage(String name, String content) {
//open the create popover
By createBy = By.className("o_sel_wiki_create_page");
+ OOGraphene.waitElement(createBy, 2, browser);
WebElement createButton = browser.findElement(createBy);
createButton.click();
//fill the name of the new page
By pageNameBy = By.cssSelector("div.o_callout_content form input[type='text']");
- OOGraphene.waitElement(pageNameBy, browser);
+ OOGraphene.waitElement(pageNameBy, 2, browser);
WebElement pageNameEl = browser.findElement(pageNameBy);
pageNameEl.sendKeys(name);
//search for it
--
GitLab