summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorAnna Koskinen <Ansku@users.noreply.github.com>2018-02-06 16:51:25 +0200
committerIlia Motornyi <elmot@vaadin.com>2018-02-06 16:51:25 +0200
commit5df70b4594691f2048bd329daed8998f36b3a141 (patch)
tree4e239ca5f5053675aa1bdee81b56a74db401092c /uitest
parentd9dd40d0e444224b734dccb98d6075aef4dd6b3e (diff)
downloadvaadin-framework-5df70b4594691f2048bd329daed8998f36b3a141.tar.gz
vaadin-framework-5df70b4594691f2048bd329daed8998f36b3a141.zip
Fix GridLayout spacing if first row/column empty and set to be hidden (#10593)
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java
index 15b4f9c507..22cbddd4c4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java
@@ -49,6 +49,7 @@ public class GridLayoutExtraSpacingTest extends MultiBrowserTest {
// Spacing off, not hiding empty rows/columns
// There should not be any spacing (red) above the csslayout
verifySpacingAbove(0, gridLayout, component);
+ verifySpacingBelow(0, gridLayout, component);
CheckBoxElement hideRowsColumnsCheckbox = $(CheckBoxElement.class)
.caption("hide empty rows/columns").first();
@@ -57,16 +58,14 @@ public class GridLayoutExtraSpacingTest extends MultiBrowserTest {
// Spacing off, hiding empty rows/columns
// There should not be any spacing (red) above the csslayout
verifySpacingAbove(0, gridLayout, component);
+ verifySpacingBelow(0, gridLayout, component);
check(spacingCheckbox);
// Spacing on, hiding empty rows/columns
// There should not be any spacing (red) above or below the csslayout
- // Oh PhantomJs...
- sleep(100);
- // FIXME: This should be 0 but there is a bug somewhere
- // verifySpacingAbove(0, gridLayout, component);
- verifySpacingBelow(6, gridLayout, component);
+ verifySpacingAbove(0, gridLayout, component);
+ verifySpacingBelow(0, gridLayout, component);
}