diff options
author | Jouni Koivuviita <jouni@vaadin.com> | 2014-08-04 10:15:44 +0300 |
---|---|---|
committer | Jouni Koivuviita <jouni@vaadin.com> | 2014-08-07 19:04:33 +0000 |
commit | 474afffeb87cd2acc632f4bf061763e77dfe08e1 (patch) | |
tree | c0158203e9c380d5bc507d7979915c1f5836b1df /uitest/src/com/vaadin/tests/extensions | |
parent | 67da8682f4f262ebf2d7598fa0f0a57fa013cd46 (diff) | |
download | vaadin-framework-474afffeb87cd2acc632f4bf061763e77dfe08e1.tar.gz vaadin-framework-474afffeb87cd2acc632f4bf061763e77dfe08e1.zip |
ResponsiveConnector should request layout update when breakpoints change
(#14354)
Change-Id: Ie995268f8d89a951e9ebb351edde4ba1e824101e
Diffstat (limited to 'uitest/src/com/vaadin/tests/extensions')
-rw-r--r-- | uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java | 61 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdateTest.java | 52 |
2 files changed, 113 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java b/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java new file mode 100644 index 0000000000..4634ebff15 --- /dev/null +++ b/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java @@ -0,0 +1,61 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package com.vaadin.tests.extensions; + +import com.vaadin.annotations.Theme; +import com.vaadin.server.Responsive; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Panel; + +@Theme("tests-responsive") +public class ResponsiveLayoutUpdate extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + HorizontalLayout layout = new HorizontalLayout(); + layout.addStyleName("layout-update"); + layout.setWidth("100%"); + setContent(layout); + Responsive.makeResponsive(layout); + + Label label = new Label( + "This label changes its size between the breakpoints, allowing more space for the adjacent component."); + label.addStyleName("change-width"); + label.setSizeUndefined(); + layout.addComponent(label); + + Panel panel = new Panel("Panel"); + panel.setContent(new Label( + "This Panel should be maximized in both breakpoints.")); + panel.setSizeFull(); + layout.addComponent(panel); + layout.setExpandRatio(panel, 1); + } + + @Override + protected String getTestDescription() { + return "A new layout phase should be requested after a new breakpoint is triggered, ensuring any style changes affecting component sizes are taken into account."; + } + + @Override + protected Integer getTicketNumber() { + return 14354; + } +} diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdateTest.java b/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdateTest.java new file mode 100644 index 0000000000..cd0a92d339 --- /dev/null +++ b/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdateTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package com.vaadin.tests.extensions; + +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.support.ui.ExpectedCondition; + +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.PanelElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class ResponsiveLayoutUpdateTest extends MultiBrowserTest { + + @Test + public void testWidthAndHeightRanges() throws Exception { + openTestURL(); + + final PanelElement panelElement = $(PanelElement.class).first(); + // I currently have no idea why PhantomJS wants a click here to work + // properly + panelElement.click(); + waitForElementVisible(By.cssSelector(".layout-update")); + + compareScreen("large"); + + // Resize below 600px width breakpoint + testBench().resizeViewPortTo(400, 768); + + waitUntil(new ExpectedCondition<Boolean>() { + @Override + public Boolean apply(WebDriver input) { + return panelElement.getSize().getWidth() < 500; + } + }); + compareScreen("small"); + } +} |