summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2010-09-17 08:37:09 +0000
committerArtur Signell <artur.signell@itmill.com>2010-09-17 08:37:09 +0000
commitb0f1e5c35caa174c2152924df5677191897e7cca (patch)
tree40762668d7aec65d2004afd1fcc5a632ff99480f /tests
parent21e4a77849363ab12037e7d8faf93eb6ff666738 (diff)
downloadvaadin-framework-b0f1e5c35caa174c2152924df5677191897e7cca.tar.gz
vaadin-framework-b0f1e5c35caa174c2152924df5677191897e7cca.zip
Removed extra large NativeButton for IE6 as IE6 can't decide how to render it
svn changeset:14979/svn branch:6.4
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/vaadin/tests/components/button/Buttons.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/src/com/vaadin/tests/components/button/Buttons.java b/tests/src/com/vaadin/tests/components/button/Buttons.java
index 7972d27df4..8af4d64bbd 100644
--- a/tests/src/com/vaadin/tests/components/button/Buttons.java
+++ b/tests/src/com/vaadin/tests/components/button/Buttons.java
@@ -49,7 +49,14 @@ public class Buttons extends ComponentTestCase<Button> {
+ LoremIpsum.get(5000), nat);
l.setWidth("100%");
l.setHeight("65px");
- addTestComponent(l);
+
+ boolean ie6 = (getBrowser().isIE() && getBrowser()
+ .getBrowserMajorVersion() == 6);
+ if (!ie6 || !nat) {
+ // Skip this NativeButton for IE6 as it can't decide how to
+ // render it
+ addTestComponent(l);
+ }
}
}