Merge changes Ide0a7e28,I78da2c2c

* changes:
  Ugly hacks to make tests screenshot compatible
  Fixed IE scrollbar issues for most if not all components

1 files changed, 13 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/components/TestBase.java b/uitest/src/com/vaadin/tests/components/TestBase.java
index b500a1144b..d267d80669 100644
--- a/uitest/src/com/vaadin/tests/components/TestBase.java
+++ b/uitest/src/com/vaadin/tests/components/TestBase.java
@@ -15,6 +15,19 @@ public abstract class TestBase extends AbstractTestCase {
         window.getContent().setSizeFull();
 
         Label label = new Label(getDescription(), ContentMode.HTML);
+        if (label.getValue() == null || "".equals(label.getValue())) {
+            // This is only an ugly hack to be screenshot compatible to be able
+            // to detect real problems when introducing IE font-size/line-height
+            // fixes
+            label.setValue(" ");
+            if (getBrowser().isIE()
+                    && getBrowser().getBrowserMajorVersion() == 9) {
+                label.setHeight("13.8px");
+            } else {
+                label.setHeight("15px");
+            }
+        }
+
         label.setWidth("100%");
         window.addComponent(label);