diff options
author | Anna Koskinen <Ansku@users.noreply.github.com> | 2019-11-26 09:58:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-26 09:58:26 +0200 |
commit | a8bce6437bb3fb05fa52910cc80cde325b1e72a9 (patch) | |
tree | 7155dc3f924667c64632e1a898f26a47a32a4152 /uitest | |
parent | 32aba81d1d0c7c084f07518c1de98f17667ea6e7 (diff) | |
download | vaadin-framework-a8bce6437bb3fb05fa52910cc80cde325b1e72a9.tar.gz vaadin-framework-a8bce6437bb3fb05fa52910cc80cde325b1e72a9.zip |
Delegate enabled handling to Composite root. (#11832)
Otherwise the changed state isn't communicated properly to the
client-side in the initial round trip, as the client-side uses the child
connector's state directly.
Fixes #11831
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/src/main/java/com/vaadin/tests/components/tree/TreeInitiallyDisabled.java | 51 | ||||
-rw-r--r-- | uitest/src/test/java/com/vaadin/tests/components/tree/TreeInitiallyDisabledTest.java | 18 |
2 files changed, 69 insertions, 0 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeInitiallyDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeInitiallyDisabled.java new file mode 100644 index 0000000000..ca4a6bdb70 --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeInitiallyDisabled.java @@ -0,0 +1,51 @@ +package com.vaadin.tests.components.tree; + +import com.vaadin.data.TreeData; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Tree; + +public class TreeInitiallyDisabled extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + Tree<String> tree = new Tree<>(); + TreeData<String> treeData = new TreeData<>(); + String parent1 = "Parent 1"; + treeData.addItem(null, parent1); + treeData.addItem(parent1, "Child 1.1"); + treeData.addItem(parent1, "Child 1.2"); + treeData.addItem(parent1, "Child 1.3"); + String parent2 = "Parent 2"; + treeData.addItem(null, parent2); + treeData.addItem(parent2, "Child 2.1"); + treeData.addItem(parent2, "Child 2.2"); + treeData.addItem(parent2, "Child 2.3"); + String parent3 = "Parent 3"; + treeData.addItem(null, parent3); + treeData.addItem(parent3, "Child 3.1"); + treeData.addItem(parent3, "Child 3.2"); + treeData.addItem(parent3, "Child 3.3"); + tree.setTreeData(treeData); + + Button button = new Button("Toggle enabled/disabled"); + button.addClickListener(event -> { + tree.setEnabled(!tree.isEnabled()); + }); + + addComponents(tree, button); + + tree.setEnabled(false); + } + + @Override + protected Integer getTicketNumber() { + return 11831; + } + + @Override + protected String getTestDescription() { + return "Initially disabled Tree should have disabled styles."; + } +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeInitiallyDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeInitiallyDisabledTest.java new file mode 100644 index 0000000000..93cb1633f1 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeInitiallyDisabledTest.java @@ -0,0 +1,18 @@ +package com.vaadin.tests.components.tree; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +import com.vaadin.testbench.elements.TreeElement; +import com.vaadin.tests.tb3.SingleBrowserTest; + +public class TreeInitiallyDisabledTest extends SingleBrowserTest { + + @Test + public void checkDisabledStyleAdded() { + openTestURL(); + TreeElement tree = $(TreeElement.class).first(); + assertTrue(tree.hasClassName("v-disabled")); + } +} |