summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-06-01 16:58:28 +0300
committerMika Murtojärvi <mika@vaadin.com>2015-06-02 14:08:18 +0000
commit4724d89af9228edcb9bbff987255122841c6d33e (patch)
tree3555a7ae6ec1d2715fdcfb201356d41495d41e24 /uitest
parent46dde5e088962d0a182c12ac1a45d70186cc12d0 (diff)
downloadvaadin-framework-4724d89af9228edcb9bbff987255122841c6d33e.tar.gz
vaadin-framework-4724d89af9228edcb9bbff987255122841c6d33e.zip
Add screenshot comparison for DisabledMenuBarItemTest
Change-Id: Ib4f9531da8b0ebb0b6294b5539bf7ab578a776b8
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItem.java2
-rw-r--r--uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java7
2 files changed, 6 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItem.java b/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItem.java
index 825f267ad3..16a822789a 100644
--- a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItem.java
+++ b/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItem.java
@@ -12,7 +12,7 @@ public class DisabledMenuBarItem extends AbstractTestUI {
MenuBar.MenuItem item = menubar.addItem("Item", null);
item.setEnabled(false);
- item.setIcon(new ThemeResource("just_a_placeholder.png"));
+ item.setIcon(new ThemeResource("common/icons/error.png"));
addComponent(menubar);
}
diff --git a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java b/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
index 0a10a7f38b..bec28d7929 100644
--- a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
+++ b/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
@@ -3,6 +3,8 @@ package com.vaadin.tests.themes.base;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import java.io.IOException;
+
import org.junit.Test;
import org.openqa.selenium.WebElement;
@@ -13,7 +15,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
public class DisabledMenuBarItemTest extends MultiBrowserTest {
@Test
- public void disabledMenuItemShouldHaveOpacity() {
+ public void disabledMenuItemShouldHaveOpacity() throws IOException {
openTestURL();
WebElement element = driver.findElement(By
@@ -23,8 +25,9 @@ public class DisabledMenuBarItemTest extends MultiBrowserTest {
if (browserIsIE8or9()) {
assertThat(element.getCssValue("filter"), is("alpha(opacity=50)"));
-
}
+
+ compareScreen("transparent");
}
private boolean browserIsIE8or9() {