diff options
| author | Sebastian Nyholm <sebastian@vaadin.com> | 2016-09-26 14:24:12 +0300 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2016-12-09 09:39:00 +0200 |
| commit | 7b39a6dd527e80499261d1e93a48af9ab629f25c (patch) | |
| tree | 571987b2b26514456dc274c5dfdcd9ca79d23da7 /uitest | |
| parent | 22063cfe1a027057e523ccd85937162af43edfd8 (diff) | |
| download | vaadin-framework-7b39a6dd527e80499261d1e93a48af9ab629f25c.tar.gz vaadin-framework-7b39a6dd527e80499261d1e93a48af9ab629f25c.zip | |
Fixes VTree so that you can click sub elements when setHtmlContentAllowed is true. (#20097)
Change-Id: Ic453aaf16ea1d44792db868e04faaba069aab3b7
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java | 4 | ||||
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java | 21 |
2 files changed, 20 insertions, 5 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java index 604847c867..106b5771a6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java @@ -28,18 +28,20 @@ public class TreeHtmlContentAllowed extends AbstractReindeerTestUI { String htmlParent = "Some <b>html</b>"; String textChild = "Child text"; String htmlChild = "Child <i>html</i>"; + String htmlElementChild = "Child <span id='my-html-element'>element html</span>"; final Tree tree = new Tree("A tree"); tree.addItem(textParent); tree.addItem(htmlParent); tree.addItem(textChild); tree.addItem(htmlChild); - + tree.addItem(htmlElementChild); tree.setParent(textChild, textParent); tree.setParent(htmlChild, htmlParent); tree.setChildrenAllowed(textChild, false); tree.setChildrenAllowed(htmlChild, false); + tree.setChildrenAllowed(htmlElementChild, false); final CheckBox toggle = new CheckBox("HTML content allowed", tree.isHtmlContentAllowed()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java index e784f990f3..613100078e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java @@ -37,19 +37,32 @@ public class TreeHtmlContentAllowedTest extends SingleBrowserTest { "unchecked", toggle.getValue()); // Markup is seen as plain text - assertTreeCaptionTexts("Just text", "Some <b>html</b>"); + assertTreeCaptionTexts("Just text", "Some <b>html</b>", + "Child <span id='my-html-element'>element html</span>"); toggle.click(); - assertTreeCaptionTexts("Just text", "Some html"); + assertTreeCaptionTexts("Just text", "Some html", "Child element html"); // Expand the HTML parent findElements(By.className("v-tree-node")).get(1).click(); - assertTreeCaptionTexts("Just text", "Some html", "Child html"); + assertTreeCaptionTexts("Just text", "Some html", "Child html", + "Child element html"); toggle.click(); assertTreeCaptionTexts("Just text", "Some <b>html</b>", - "Child <i>html</i>"); + "Child <i>html</i>", + "Child <span id='my-html-element'>element html</span>"); + + toggle.click(); + findElements(By.id("my-html-element")).get(0).click(); + assertHtmlElementSelected(); + + } + + private void assertHtmlElementSelected() { + TreeElement tree = $(TreeElement.class).first(); + Assert.assertEquals(tree.getValue(), "Child element html"); } private void assertTreeCaptionTexts(String... captions) { |