diff options
author | Anna Miroshnik <anna.miroshnik@arcadia.spb.ru> | 2014-10-07 19:37:30 +0400 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2014-10-22 11:42:33 +0000 |
commit | 63efaa9aef402bc3d9afa075b8109961ef0cd301 (patch) | |
tree | 827a21230639be92bd7fd687f6e8435e2701ebc5 /uitest/src/com/vaadin/tests/layouts | |
parent | 4c8e883dc4c809dc08a60b4ea49313a302bcea05 (diff) | |
download | vaadin-framework-63efaa9aef402bc3d9afa075b8109961ef0cd301.tar.gz vaadin-framework-63efaa9aef402bc3d9afa075b8109961ef0cd301.zip |
Fix: Empty space on page after expanded component (#12672)
Full defect name: Empty space on page after expanded component - incorrect height calculation in Chrome
Layout:
[
Panel (auto x auto) [
Grid (auto x auto)
]
AnyComponent (100% x 100%)
<EMPTY SPACE>
Also sleep() was removed from tests BaseLayoutExpandTest and
BaseAddReplaceMoveTest
Change-Id: Ie8a14a58dd53a26a133ea99a7b809d92c1b33a1f
Diffstat (limited to 'uitest/src/com/vaadin/tests/layouts')
-rw-r--r-- | uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java | 5 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java index 73dc39009d..786e47cef1 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.util.List; import org.junit.Test; +import org.openqa.selenium.By; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -27,7 +28,7 @@ public abstract class BaseAddReplaceMoveTest extends MultiBrowserTest { @Test public void LayoutAlignment() throws IOException, InterruptedException { openTestURL(); - sleep(500); + waitForElementPresent(By.className("v-table")); compareScreen("initial"); String[] states = { "add", "replace", "move", "remove" }; List<ButtonElement> buttons = $(ButtonElement.class).all(); @@ -35,7 +36,7 @@ public abstract class BaseAddReplaceMoveTest extends MultiBrowserTest { // go through all buttons click them and see result for (ButtonElement btn : buttons) { btn.click(); - sleep(500); + waitForElementPresent(By.className("v-table")); compareScreen(states[index]); index++; } diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java index 08f5aed808..036b053fb5 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java @@ -19,21 +19,17 @@ import java.io.IOException; import java.util.List; import org.junit.Test; +import org.openqa.selenium.By; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; -/** - * - * @since - * @author Vaadin Ltd - */ public abstract class BaseLayoutExpandTest extends MultiBrowserTest { @Test public void LayoutExpand() throws IOException, InterruptedException { openTestURL(); - sleep(500); + waitForElementPresent(By.className("v-table")); compareScreen("initial"); String[] states = { "expand_100_0", "expand_50_50", "expand_25_75" }; List<ButtonElement> buttons = $(ButtonElement.class).all(); @@ -41,7 +37,7 @@ public abstract class BaseLayoutExpandTest extends MultiBrowserTest { // go through all buttons click them and see result for (ButtonElement btn : buttons) { btn.click(); - sleep(500); + waitForElementPresent(By.className("v-table")); compareScreen(states[index]); index++; } |