aboutsummaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorThomas <thomas@vaadin.com>2013-11-07 13:03:52 +0200
committerVaadin Code Review <review@vaadin.com>2013-11-11 09:50:05 +0000
commitc308d8a949095ec49a6933d2d4424d078fb4e210 (patch)
tree31ac7f6206d2bd1f77a3260c19a4088f496a6f60 /uitest
parent23815e62071d9a80fc4045fb5f1dbede6a0823c2 (diff)
downloadvaadin-framework-c308d8a949095ec49a6933d2d4424d078fb4e210.tar.gz
vaadin-framework-c308d8a949095ec49a6933d2d4424d078fb4e210.zip
Fixes double scrollbar issue in browserframes (#11780)
Fixed by adding font-size 0 to the base theme. Change-Id: I8d0224cb65f8ab36c50d2fd68157de4803c823e2
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java40
-rw-r--r--uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java15
2 files changed, 55 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java
new file mode 100644
index 0000000000..5151ad5dd3
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java
@@ -0,0 +1,40 @@
+package com.vaadin.tests.components.browserframe;
+
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.BrowserFrame;
+import com.vaadin.ui.TabSheet;
+
+public class BrowserFrameDoubleScrollbars extends AbstractTestUI {
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 11780;
+ }
+
+ @Override
+ protected void setup(VaadinRequest request) {
+
+ getLayout().setHeight("100%");
+ getLayout().setSizeFull();
+ getLayout().getParent().setSizeFull();
+
+ TabSheet tabs = new TabSheet();
+ tabs.setSizeFull();
+ getLayout().addComponent(tabs);
+
+ BrowserFrame help = new BrowserFrame();
+ help.setSizeFull();
+ help.setSource(new ExternalResource("/statictestfiles/long-html.htm"));
+
+ tabs.addComponent(help);
+
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "Embedded browser causes second scrollbar";
+ }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java
new file mode 100644
index 0000000000..ade43735a7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java
@@ -0,0 +1,15 @@
+package com.vaadin.tests.components.browserframe;
+
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class BrowserFrameDoubleScrollbarsTest extends MultiBrowserTest {
+
+ @Test
+ public void testWindowRepositioning() throws Exception {
+ openTestURL();
+
+ compareScreen("BrowserFrameDoubleScrollbars");
+ }
+}