From 10ca8740dbce951078c6ce738c3f5548f1cdf7f8 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 12 Jul 2016 12:12:11 +0200
Subject: [PATCH] no-jira: wait a little after auto publish
---
.../generic/title/TitledWrapperController.java | 4 ++--
.../olat/selenium/page/course/CoursePageFragment.java | 11 +++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/control/generic/title/TitledWrapperController.java b/src/main/java/org/olat/core/gui/control/generic/title/TitledWrapperController.java
index 67fae5d457c..95ac2246b86 100644
--- a/src/main/java/org/olat/core/gui/control/generic/title/TitledWrapperController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/title/TitledWrapperController.java
@@ -104,7 +104,7 @@ public class TitledWrapperController extends BasicController
theVelocityContainer.put(COMPONENT_NAME, controller.getInitialComponent());
}
- this.wrapperCss = wrapperCss;
+ this.wrapperCss = (wrapperCss == null ? "" : wrapperCss);
this.titleInfo = titleInfo;
// set title info variables
@@ -114,7 +114,7 @@ public class TitledWrapperController extends BasicController
theVelocityContainer.contextPut(TITLE_SIZE, titleInfo.getTitleSize());
theVelocityContainer.contextPut(USE_SEPARATOR, Boolean.valueOf(titleInfo.isSeparatorEnabled()));
theVelocityContainer.contextPut(ICON_CSS, titleInfo.getIconCssClass());
- theVelocityContainer.contextPut(WRAPPER_CSS, wrapperCss);
+ theVelocityContainer.contextPut(WRAPPER_CSS, this.wrapperCss);
//set the description if any
if (StringHelper.containsNonWhitespace(titleInfo.getDescription())) {
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 ab36b4d00f8..c4b402064de 100644
--- a/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
+++ b/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
@@ -81,13 +81,12 @@ public class CoursePageFragment {
}
public CoursePageFragment assertOnTitle(String displayName) {
- List<WebElement> titleList = browser.findElements(By.tagName("h2"));
- Assert.assertNotNull(titleList);
- Assert.assertEquals(1, titleList.size());
+ By titleBy = By.xpath("//h2[text()[contains(.,'" + displayName + "')]]");
+ OOGraphene.waitElement(titleBy, 5, browser);
- WebElement title = titleList.get(0);
- Assert.assertTrue(title.isDisplayed());
- Assert.assertTrue(title.getText().contains(displayName));
+ WebElement titleEl = browser.findElement(titleBy);
+ Assert.assertNotNull(titleEl);
+ Assert.assertTrue(titleEl.isDisplayed());
return this;
}
--
GitLab