aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-07 14:24:36 +0300
committerMika Murtojarvi <mika@vaadin.com>2015-09-11 16:34:50 +0300
commited592a47f852634b74a272b7e777379ba13401aa (patch)
treee20d13262467d5688120a4bb59821d38ccfbf849 /uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
parent5758c50743924132f6f9b9e22b22c9b102787a42 (diff)
downloadvaadin-framework-ed592a47f852634b74a272b7e777379ba13401aa.tar.gz
vaadin-framework-ed592a47f852634b74a272b7e777379ba13401aa.zip
Make test work correctly with resynchronize
Change-Id: I4aaf8875cbd69db525c4aaa8ac92a26b3b11b158
Diffstat (limited to 'uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java')
-rw-r--r--uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java15
1 files changed, 1 insertions, 14 deletions
diff --git a/uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java b/uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
index e4788f93f5..cb5e9d07c7 100644
--- a/uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
+++ b/uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
@@ -21,10 +21,8 @@ import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.remote.DesiredCapabilities;
-import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.parallel.Browser;
@@ -55,18 +53,7 @@ public class ThemeChangeFaviconTest extends SingleBrowserTest {
private void changeTheme(final String theme) {
$(ButtonElement.class).caption(theme).first().click();
-
- final WebElement rootDiv = findElement(By
- .xpath("//div[contains(@class,'v-app')]"));
- waitUntil(new ExpectedCondition<Boolean>() {
-
- @Override
- public Boolean apply(WebDriver input) {
- String rootClass = rootDiv.getAttribute("class").trim();
-
- return rootClass.contains(theme);
- }
- }, 30);
+ waitForThemeToChange(theme);
}
private void assertFavicon(String theme) {